Dumb question about git

[Daniel Murphy]

Unless you have an expectation that other people are already using the old 
version of your branch, just use 'git push blah -f' to overwrite the old 
version.  It's not a big deal for patches and pull requests, but it would be 
a disaster if anyone did this to the master branch.

"H. S. Teoh" <hsteoh at quickfur.ath.cx> wrote in message 
news:mailman.271.1330614611.24984.digitalmars-d-learn at puremagic.com...
> OK, so I'm new to git, and I ran into this problem:
>
> - I forked druntime on github and made some changes in a branch
> - Pushed the changes to the fork
> - Pulled upstream commits to master
> - Merged master with branch
> - Ran git rebase master, so that my changes appear on top of the latest
>  upstream master.
> - Tried to push branch to my fork, but now it complains that I have
>  non-fast-forward changes and rejects the push.
>
> What's the right thing to do here? Looks like I screwed up my branch
> history. How do I fix it?
>
> Thanks!
>
>
> T
>
> -- 
> Real Programmers use "cat > a.out".