How to avoid merge conflicts(dudzik.co)
dudzik.co
How to avoid merge conflicts
https://dudzik.co/digress-into-development/how-to-avoid-merge-conflicts/
5 comments
fossil helps alleviate these issues with it's autosync feature: http://fossil-scm.org/index.html/doc/trunk/www/concepts.wiki
Most my merge conflicts happen to be xml based files e.g csproj
It's rather cute to so naively believe such practices can be maintained.
This comment breaks these two site guidelines:
When disagreeing, please reply to the argument instead of calling names. "That is idiotic; 1 + 1 is 2, not 3" can be shortened to "1 + 1 is 2, not 3."
Please don't post shallow dismissals, especially of other people's work. A good critical comment teaches us something.
Could you please read https://news.ycombinator.com/newsguidelines.html and stick to those rules when posting here?
When disagreeing, please reply to the argument instead of calling names. "That is idiotic; 1 + 1 is 2, not 3" can be shortened to "1 + 1 is 2, not 3."
Please don't post shallow dismissals, especially of other people's work. A good critical comment teaches us something.
Could you please read https://news.ycombinator.com/newsguidelines.html and stick to those rules when posting here?
The actual game changer is separating concerns properly. Small classes tend to be more cleanly separated, but it's not a given. And when your concerns are properly separated, it doesn't matter much if the separated concerns happen to be in separate files or not.