如何始终使用git mergetool进行合并？

Question

I am managing a repo where people in my team often submit codes that should be discarded. When I do a git pull, it automatically merge the files and it is annoying to go into each files to delete the codes. I use command line and gitkraken to manage the repo. Is it possible to stop auto merge and require each pull with mergetool?

Answer 1

也许您可以在合并后仅使用git revert来撤消那些不需要其代码的提交？

Answer 2

I guess would be related to git workflows and how to manage a repo in a development team by defining various branches for dev , mainstream and etc.

You can read about it here .

Basically, what development team do is creating subbranch from the stable branch before starting their development (let's call it dev-featureX ) and once development was completed, changes are pushed to the same branch on the remote server (in our case: origin/dev-featureX ). Repo maintainer (in our case means you) pull all the branches in its client:

git pull

checkout to recently published branch:

git checkout dev-featureX

Review and audit the codes and changes and finally merge approved changes to the main branch (imagine in our case, dev branch):

git merge dev-featureX dev

Note that, the easiest workflow to manage called Centralized-workflow which has a similar approach to traditional VCS like SVN.

Answer 3

Stop using git pull . All it does is run two other Git commands. If you run the two other commands yourself, you have more control.

First, run git fetch to bring over the new code.

Then, run git merge --no-commit to merge without committing. You may now run additional commands. However, note that git mergetool assumes that anything Git merged by itself is correctly merged, and does not offer re-merging of these files.