22 Feb
2009
22 Feb
'09
8:44 p.m.
Bryan Ischo wrote:
OK so I've played with git-rebase a little bit and I can see how it's better than git-merge for getting changes into a new branch so that they can be modified. But I think I'd still have to do "git reset HEAD^" and then modify my changes and check the modifications in, and all the other steps, right?
Thanks, Bryan
Meh. I checked in my git-rebased change, then git reset HEAD^, then modified the change and checked it back in. Then I tried git-rebase to get my next change in the sequence, and I got a zillion weird conflict problems. I don't think you can git-rebase multiple changes iteratively, making changes in between. Or if you can, maybe I'm just not using it right ... Thanks, Bryan