Re: [git-users] Merging by solving conflicts with their version, except for...
Tassilo Horn tass...@member.fsf.org writes: Hi Thomas, 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 starts at 7:50). I'll check it out. That trick was totally the right thing. With that, the merge was much, much easier. :-) Thanks a ton, Tassilo -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Merging by solving conflicts with their version, except for...
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 Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/-X4crLTxFagJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Merging by solving conflicts with their version, except for...
Thomas Ferris Nicolaisen tfn...@gmail.com 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 starts at 7:50). I'll check it out. Bye, Tassilo -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
