I’m merging in a remote branch that may have a lot of conflicts. How can I tell if it will have conflicts or not?

I don’t see anything like a --dry-run on git-merge.

20 Answers
20

Tags:

Leave a Reply

Your email address will not be published. Required fields are marked *