3 ms·

diff3 is the way to go. When there are not trivial changes, it is hard to resolve conflicts if you do not know where the conflicting changes come from. I knew

diff3 is the way to go. When there are not trivial changes, it is hard to resolve conflicts if you do not know where the conflicting changes come from. I knew quite a few people that do not know that this option even exists. In my opinion it could make the life of engineers a lot better if this was the default.

loeg 4y ago
Yeah, it's one of the first things I change in .gitconfig or .hgrc: [merge] conflictstyle = diff3
- pabs3 4y ago
  The git zdiff3 conflictstyle is a newer better version of diff3.
  - loeg 4y ago
    Cool.