|
|
|
|
|
|
by idoubtit
480 days ago
|
|
|
That was a useful read. I'd been frustrated by `merge.conflictstyle = diff3` so I'm glad I learned about `zdiff3`. I also discovered `fetch.prune` and `pull.autoSetupRemote` which will slightly enhance my workflow. My only disagreement is with the diff prefixes. I prefer to display one path starting with ".", so that I can double-click it and paste it. So I don't want contextual prefixes, I'll keep my `diff.dstPrefix = ./`. |
|
|