New commit on top of other commits was removed, new work on the earlier commits from others, how to revive the removed commit? When checking out the last commit before the one that is to be revived, pull fails: divergent branches:
$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Trying this, taken from How to Merge when you get error Hint: You have divergent branches and need to specify how to reconcile them.:
git config pull.rebase false
But then, git pull still throws:
Error:
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging xzy/xyz/my_file.xyz
CONFLICT (add/add): Merge conflict in xzy/xyz/my_file.xyz
Auto-merging xzy/xyz/my_file.abc
CONFLICT (add/add): Merge conflict in xzy/xyz/my_file.abc
What to do to be able to update all of the commits from the branch and then push the removed one back on top?
