dissip
BigCat
发贴: 240
积分: 60
|
于 2006-03-27 16:52
3x for your comments. but
in my rebase diagram: at point 5(after rebase 1), code changes in trunk(from 1->3) are merged. at point 8(after rebase 2), code changes in trunk(from 3->6) are merged. at point 9, when i try to merge all changes on branch to trunk, it's hard for me to distinguish which change is made on branch(this is what we need to merge) and which come from trunk by previous rebase(already have on trunk). So i compare the diff from point 9 to point 2, and merge the diff to trunk. this will cause the changes that's rebased from trunk to be merge back to trunk again. it will cause collision.
To live is to fight.
|