On 01.03.2012 19:11, H. S. Teoh wrote:
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
I use the magic
pull --rebase <how-ever-you-call-dlang> master
instead of these 3 if I have changes but want to sync with upstream.
- 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.
That's pretty much all.
- Tried to push branch to my fork, but now it complains that I have
non-fast-forward changes and rejects the push.
I think
push --force
should do the trick
What's the right thing to do here? Looks like I screwed up my branch
history. How do I fix it?
Thanks!
T
--
Dmitry Olshansky
