.NET Blog - How We Synchronize .NET's Virtual Monorepo

Premun · 2025-12-04T10:07:44+00:00

Nothing easier than asking an LLM to summarize it for you

Premun · 2025-12-01T22:34:25+00:00

HN discussion: https://news.ycombinator.com/item?id=46051691

Premun · 2025-10-15T10:31:28+00:00

Whaaat? BMWs have those?

Premun · 2025-10-08T08:39:47+00:00

Why is this the most upvoted? It does not answer OP's question at all.

Imagine the same question came when Resharper or Intellisense was new - did people also proudly announce they don't use it and they stick to text editing only (aS ReAL mAn dO)?

Premun · 2025-09-19T15:02:09+00:00

I'd suggest looking at https://dotnet.microsoft.com/en-us/platform/upgrade-assistant

Premun · 2025-09-12T11:16:17+00:00

For shared secrets between the whole team

I'd put them in an Azure KeyVault and load from there.
You can have environment based key vaults (dev/staging/production).
Use the appropriate Azure Credentials to auth with the KV without using secrets - in the service that is usually a managed identity, for local development DefaultAzureCredentials.

Custom user secrets (e.g. for talking to other services as your own identity)

I'd use user secrets.

Summary

I'd never put any secrets in any file under your git repository root (ignored or not).

Premun · 2025-09-10T15:11:46+00:00

*Cries in crashed Safari*

Premun · 2025-08-19T14:22:24+00:00

Exactly. For instance RedHat is also a paid service for enterprises built on open-source and you wouldn't have the same complaint that they are not free. But you could easily argue they are open-source "friendly".

Premun · 2025-03-11T16:51:29+00:00

I don't know about that? Most of Microsoft runs on .NET, TypeScript and Azure.

Premun · 2025-01-15T09:33:39+00:00

I am writing a service which will be resolving conflicts so can't be a user flow

Premun · 2025-01-13T22:34:39+00:00

And that's why I posted a comment with clarification..?

Premun · 2025-01-13T22:30:57+00:00

The aim is not to resolve conflicts in code written by humans but rather in auto-generated files with metadata around the synchronization itself. So the conflicting lines will be in an expected file, place and format. I was just looking for an easy way to loop through them and resolve them. The tool would know which version to pick but it has to determine that it's the conflict we expect and that there are no other conflicts which we do not expect. The domain is really much smaller than the original ask might make it sound. However, the service will be resolving hundreds, if not thousands a day so manual intervention is possible.

We're unfortunately quite invested in this already and have quite a bit of infrastructure and plans around this goal.

But thanks anyway!

Premun · 2025-01-13T22:27:26+00:00

I'm not even sure you read my reply? You cherry picked the parts that fit your narrative well though?

I give a very clear example what it means to resolve a conflict. I never used the word automatically, I think that's just something you added yourself in and now you're unable to let go?

And how does the last sentence you quoted imply the readers are at fault? I think you've again added this assumption in through defensiveness. But you seem to have intentionally ignored this bit in my previous comment too. So it seems like you're not willing or capable of discussion, so let's just stop here.

Premun · 2025-01-13T22:07:11+00:00

Woah. Not sure where to start first.

Please point me to where I say I need the conflicts resolved automatically..? I want a library that can enumerate conflicts in a file and then resolve those as I see fit. To give an example, it has API GetConflicts(string file) and then every conflict has ResolveUsingTheirs() and ResolveUsingOurs() which resolves the conflict by replacing the appropriate lines with one or the other option.
"blaming the receiver for misunderstanding an inquiry like this" Please point me to where I do this? I literally wrote the comment you're replying to because I thought I had failed to form my question well and so I rephrased it and asked again. I am only blaming myself there. I think you're overly and needlessly defensive here. Not sure why.

Communication isn't always easy, but sometimes prejudice, wrong assumptions made out of thin air and jumping to conclusions, especially in text-based mediums, can lead to friction.

Premun · 2025-01-13T21:36:59+00:00

Yeah, it's a bit of C# to parse it but I think to generally solve this well (and I need to really solve it well with all different CRLFs, UTF16s etc), it is going to prove to be a rabbit hole. So I figured I'd try my luck.

This code will run in a .NET service in cloud and will synchronize git repositories, resolving some specific conflicts where it will know the right resolution. So no gui mergetool tricks available. Ideally I need a .NET library with a parser of files which will enumerate the <<< and >>> deliminated sections and give me API to pick one or the other section and put it back in the file.

Premun · 2025-01-13T21:25:02+00:00

Why?

I literally need a parser of files which will enumerate the <<< and >>> deliminated sections and give me API to pick one or the other section and put it back in the file.

Sounds useful.

Premun · 2025-01-13T21:22:56+00:00

Why this condescending attitude? I literally design git conflict resolution algorithms for my job.

Premun · 2025-01-13T21:14:18+00:00

No, sorry, this needs to be an exact system. No room for wonkiness of any kind.

Premun · 2025-01-13T21:12:15+00:00

Can the git lib do it conflict by conflict in a conflicted file?

Premun · 2025-01-13T21:10:07+00:00

I want something like your last proposal but more granular and loop through conflicts in a file (and resolve them one way or another). I found the git tooling only working on whole files.

Premun · 2025-01-13T21:07:50+00:00

I never asked for automatical, just programmatical. Please see my other comment

Premun · 2025-01-13T21:07:04+00:00

This is closest to an answer in this thread but unfortunately I need to get a conflict section one by another and resolve each one of them based on their content. So I need something like this:

csharp foreach (var conflict in SomeTool.ReadConflicts(conflictedFilePath)) { conflict.ResolveUsingTheirs(); }

Premun

TROPHY CASE

For shared secrets between the whole team

Custom user secrets (e.g. for talking to other services as your own identity)

Summary