Answer the question
In order to leave comments, you need to log in
Answer the question
In order to leave comments, you need to log in
Roughly speaking, you did not start your commit from the top of the master branch, but this is easily cured, download the entire master branch from github, using the command:
If there are conflicts, resolve them, and then execute git rebase --continue
. Conflicts can be in several stages, so you may have to resolve conflicts and do continue several times.
Well, then, you can do your git push.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question