Have Geek Brain

Git reinstall conflict was caused by commit

when i run git reinstall master sometimes i get conflict. And sometimes it is very difficult to track down the problem even with error messages. It would be a real help if I could find out which commit git is trying to reapply and causing a conflict.

How do I know which commit is causing the conflict?

+2


a source to share


1 answer


Look in the conflicting file (s), lines starting with >>>>>>>

show the commit hash that caused the conflict.



+1


a source






More articles:


All Articles