Hot answers tagged

2 votes

git: checking merge conflicts WITHOUT actually doing the merge

Merging is not "just merging". You can choose different strategies to merge branches, and I'm afraid that the git is unable to predict (figure out) conflicts before the branches are actually ...
acan's user avatar
  • 21

Only top scored, non community-wiki answers of a minimum length are eligible