[git-users] Merging by solving conflicts with their version, except for...

2012-02-15 Thread Tassilo Horn
Hi all, we've just converted from HG to git. Thereby, I've accidentally deleted an empty commit that actually was the BASE of master (HG default) and a new foobar branch. (I did "git filter-branch --prune-empty" to prune the empty "hg commit --close-branch" commits in order to strip old branches

Re: [git-users] Merging by solving conflicts with their version, except for...

2012-02-15 Thread Tassilo Horn
Tassilo Horn writes: > we've just converted from HG to git. Thereby, I've accidentally > deleted an empty commit that actually was the BASE of master (HG > default) and a new foobar branch. (I did "git filter-branch > --prune-empty" to prune the empty "hg commit --close-branch" commits > in ord

Re: [git-users] Merging by solving conflicts with their version, except for...

2012-02-15 Thread Thomas Ferris Nicolaisen
How about saying that (G)'s parent is (B) by using grafts? I've got an example of using grafts in this screencast: http://blog.tfnico.com/2010/10/gitsvn-6-grafting-together-svn-history.html (the interesting part starts at 7:50). -- You received this message because you are subscribed to the G

Re: [git-users] Merging by solving conflicts with their version, except for...

2012-02-15 Thread Tassilo Horn
Thomas Ferris Nicolaisen writes: > How about saying that (G)'s parent is (B) by using grafts? Exactly, that's what I'd like to do. > I've got an example of using grafts in this > screencast: > http://blog.tfnico.com/2010/10/gitsvn-6-grafting-together-svn-history.html > (the interesting part