Geek Answers Handbook

Git push rejected, merge conflicts, git pull --rebase

I try to push a commit, but I can’t, because there is another commit (the same level in the HEAD race :)

I know that I need to combine these two commits together, not quite exactly how to do this.
I already tried git pull --rebase .

My GIT -CLI :

git cli

+7
git git-commit github
source share
1 answer

All you have to do is resolve the conflict that you mentioned at the end of your pull --rebase .
See " HOW TO PROVIDE CONFLICTS : You will need to open these files and remove the conflict markers.
For the .tern-port file, you need to decide if you want to save the file and delete it, since it has been deleted up in the repository.

I forgot to configure my .gitignore file.

If you understand that due to monitored files that should not be tracked, be sure to track them first before adding them to your .gitignore

 git rm --cached -- afile echo afile >> .gitignore git add .gitignore

This can be done during the conflict resolution phase.

Once this step has been completed, add them ( git add . ) And continue rebase ( git rebase --continue ).
After that, if git status clean, you can click.

+6
source share

More articles:


All Articles