I have a fork of the Perforce bundle, except that I forked it from a previous GitHub fork that did a SVN import. When I try to follow the recent instructions for rebasing, I end up with "no common commits" and no real idea of how to resolve that situation.
Is there something I can try to get my fork rebased to the official bundle (and get GitHub to note that), or am I better off just newly forking the official mirror and replaying the changes?
-Adam Vandenberg http://adamv.com/
On 24 Jun 2009, at 22:32, Adam Vandenberg wrote:
I have a fork of the Perforce bundle, except that I forked it from a previous GitHub fork that did a SVN import. When I try to follow the recent instructions for rebasing, I end up with "no common commits" and no real idea of how to resolve that situation.
Is there something I can try to get my fork rebased to the official bundle (and get GitHub to note that), or am I better off just newly forking the official mirror and replaying the changes?
Any by “recent instructions” are you referring to my letter to the textmate-dev list?
Would be good if you’d post step-by-step of what you tried (since this shouldn’t really be a problem).