Geek Answers Handbook

A tool for resolving "trivial conflicts" in git

Do you know any tool / switch for git commands that help me prevent conflicts or speed up mergers?

Currently, I often get "trivial conflicts", such as:

++<<<<<<< HEAD ++======= + onClick + onWakeup ++>>>>>>> 587f917...

I assume that this is caused by some gaps .. it is very easy to solve by a person, however, it takes a long time to resolve all such conflicts.

Is there any tool that can automatically resolve this type of conflict?

PS. I am still learning English, but sometimes I make stupid mistakes. I do my best writing questions and answers in English, however I would be very happy if you edit my post in case of any errors. I promise your efforts will not be wasted.

+4
source share
2 answers

If you resolve the same conflicts again and again, then you probably want to use git rerere .

+3
source

Run git-mergetool to resolve merge conflicts. See here page . Git has several options for union tools. I prefer kdiff3 . It is open source, cross-platform and easy to learn.

Git resolves as many conflicts as it can. If you receive this message, it means that Git has detected a conflict that requires human intervention.

+2
source

More articles:


All Articles