|
| From: | Rune Zedeler |
| Subject: | Re: Git conflicts |
| Date: | Fri, 20 Jun 2008 20:43:43 +0200 |
| User-agent: | Thunderbird 2.0.0.14 (X11/20080502) |
Rune Zedeler skrev:
$ git rebase -i --onto remotes/dev/rune2 HEAD~15
Sorry for the noise, my git is too old (1.5.2.5).It worked with rebase -v - now my dev/rune actually looks perfect - the merge gone and all :) Thanks for helping!
Unfortunately I ofcourse cannot push onto origin - (error: remote 'refs/heads/dev/rune' is not a strict subset of local ref 'refs/heads/dev/rune'.)
Should I "push -f" ? -Rune
| [Prev in Thread] | Current Thread | [Next in Thread] |