5 ms·
My experience is that the conflict files (with <<<< ===== >>>>) that git generates do have all the trivial conflicts resolved. In fact, before I learned what th
by pavon 5y ago
My experience is that the conflict files (with <<<< ===== >>>>) that git generates do have all the trivial conflicts resolved. In fact, before I learned what the the magic-wand icon did, the IntelliJ merge conflict tool really annoyed me since it showed all sorts of conflicts that git didn't.
- theptip 5y agoJetBrains resolves conflicts that git can’t IME. For example multiple branches modifying the same import lines in a Python file (most common merge conflict I see), JetBrains can resolve this. I’d be interested to know how they solve it, I suspect they run some language-aware logic to do the merge on a given hunk.
- davvid 5y agoThere's a (relatively) new feature in Git that makes the conflicts even better. This write-up is deep and super comprehensive: https://www.eseth.org/2020/mergetools.html https://www.eseth.org/2020/mergetools.html `git config mergetool.hideResolved true` enables the modern git mergetool behavior.