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".
