Closed lk108 closed 10 years ago
You would need to rebase those commits out.
@michaelrice Thank you for your help. So i did git fetch upstream git rebase upstream/master
Then I pushed this to my origin. I had to use git push -f for that. Looks good to me now. Can you confirm that it is ok now?
Looks good now. Thanks!
Before accepting this pull request, please check what these 2 "Merge remote branch 'upstream/master' are. I've got no idea what they are doing here. Looks like I'll have to get more familiar with git.