3 ms·
Three files side by side is extremely common for those of us who have to regularly resolve merge conflicts. You put the common ancestor in the middle and the di
by snprbob86 14y ago
Three files side by side is extremely common for those of us who have to regularly resolve merge conflicts. You put the common ancestor in the middle and the diverging changes on either side, then you edit both sets of changes in to that middle buffer.
- balloot 14y agoI resolve merge conflicts as well. Every system I've ever used gives you one file with delineated chunks (<<<<, === >>>). Never once have I said "this is too difficult - I need three windows open." And even if I did say that sometimes, I can't imagine optimizing the character width of my code for that one use case.
- nonamegiven 14y agoThe most definite thing that should be taken from a thread like this is that it usually boils down to personal preference. In fact I'd say that personal preference in these matters should take at least as much preference as any available emperical studies. If you're in a group, and you don't get your way in the coding standards meeting, accept it and move on. You can do it! :)