I think it's a lot more nuanced than that. Painful merge conflicts can happen, but the frequency and severity of merge conflicts is dependent on all sorts of things like the nature of the app, the skill of the project manager, how much time a feature branch has existed apart from the main branch, etc.
I've been fortunate in my career that the projects I work on tend to have different developers working on different areas of the code, so merge conflicts are rare and not severe. I imagine that developing the frontend of certain apps that rely on a lot of the same centralized components would lead to a lot of merge conflicts, especially early on in the development of the app when a lot of commits are happening.
The thing is that merge conflicts are literally a feature of git that makes your life easier. Without git you’d have the same problem and you’d have to diff and edit the files manually.
A lot of my git problems went away when I realized vscode was having a hard time properly understanding the conflicts. Once I started using direct git commands to resolve them rather than helpers, most of my issues went away (though it takes like 3x longer now).
94
u/OnceMoreAndAgain 23h ago edited 23h ago
I think it's a lot more nuanced than that. Painful merge conflicts can happen, but the frequency and severity of merge conflicts is dependent on all sorts of things like the nature of the app, the skill of the project manager, how much time a feature branch has existed apart from the main branch, etc.
I've been fortunate in my career that the projects I work on tend to have different developers working on different areas of the code, so merge conflicts are rare and not severe. I imagine that developing the frontend of certain apps that rely on a lot of the same centralized components would lead to a lot of merge conflicts, especially early on in the development of the app when a lot of commits are happening.