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
.
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
.