Feature request: Way to get a sense of a conflict

mystor / git-revise

A handy tool for doing efficient in-memory commit rebases & fixups

MIT License

737 stars 30 forks source link

Feature request: Way to get a sense of a conflict #54

Open anordal opened 4 years ago

anordal commented 4 years ago

Saying which commit has failed (#45) only helps as far as one remembers what each commit is doing in the conflicting lines. In a conflict situation with regular rebase, git diff will show a combined diff, which helps get a sense of this:

- Hello Word!
+ Hello World!
 +Oops, gotta add a new line!
  How are things?

The same information is available in the --diff3 mode of git merge-file.

mystor commented 4 years ago

I have merge.conflictStyle = diff3 in my global .gitconfig, which changes the default output of git merge-file to be diff3 by default.

It is also possible to add a --diff3 flag to git revise to override that behaviour, but the easiest fix for now is probably to configure git to use diff3 style merge conflicts.