2 ms·
The one thing I really miss from perforce/source depot was seeing the original code block when performing a merge. Its so much more difficult to merge just seei
by jdsully 6y ago
The one thing I really miss from perforce/source depot was seeing the original code block when performing a merge. Its so much more difficult to merge just seeing both new sections.
- matvore 6y agoFor diffs that include the common ancestor, add this to .gitconfig: [merge] conflictStyle = diff3
- yencabulator 6y agoGit can call a whole bunch of merge visualization and conflict resolution tools. See `git mergetool --tool-help`.