« Despite aggressive rebasing, I still end up with bloody merge conflicts on my hands from time to time. Why is that?»
there’s another reason why this might happen - you dont have conflicts, if your changes don’t overlap with others. Why are you working on the same code as others? Two reasons - lack of communication, and as a result, two similar so identical features are developed, or your software is coupled and lacks separation of concerns, and virtually any feature requires touching “god classes” here and there.
I mean conflicts can still happen, in config files for example, but I assume if conflicts hurt - its domain code )
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
« Despite aggressive rebasing, I still end up with bloody merge conflicts on my hands from time to time. Why is that?»
there’s another reason why this might happen - you dont have conflicts, if your changes don’t overlap with others. Why are you working on the same code as others? Two reasons - lack of communication, and as a result, two similar so identical features are developed, or your software is coupled and lacks separation of concerns, and virtually any feature requires touching “god classes” here and there.
I mean conflicts can still happen, in config files for example, but I assume if conflicts hurt - its domain code )