On Tuesday, March 8, 2016 at 3:55:03 PM UTC-6, Andreas Noack wrote:
>
> No problem. When you have made a change like this, i.e. a hard reset or a
> rebase and want to push the changes to an existing branch you'll have to
>
> git push --force origin glmms
>
> because git is trying to prevent you
No problem. When you have made a change like this, i.e. a hard reset or a
rebase and want to push the changes to an existing branch you'll have to
git push --force origin glmms
because git is trying to prevent you from making a non-recoverable change
to your repo. The reason is that when you
Thanks, Andreas. Unfortunately, I am still in trouble. Sorry to be such a
PITA.
When I apply those changes that you describe it is okay until I try to push
the changes. The response I get is that I can't push to origin/glmms
because the branches have diverged.
$ git status
On branch glmms
Provided that you have pushed all your changes, I think the easiest
solution is to "remove" the commit in which you add the chksqr fix. You can
do that with
git reset --hard c0b5c41d136013a8e2cd57f5bedd8c96f5d2e3c6 # the commit
right before the chksqr changes
git cherry-pick
Having looked closer (nothing like a public post to cause you to read again
and discover you were wrong) I see that I did change all those files in the
glmms branch that Andreas changed in his pull request. I hadfixed the
issue that Andreas addressed but in a different way and our changes
