rebase merge conflicts

[whyrusleeping]

I just thought I would share a solution to a problem I had encountered.
When there were conflicts between git and clearcase i would have to rebase before pulling or else it caused gitcc to have a fit. The solution (workaround) is as follows

gitcc rebase //this is the rebase that will cause a merge conflict
git mergetool //to resolve the conflicts
git add -A
git rebase --continue

git checkout master_cc
git merge master //or whatever branch you were trying to merge to
git checkout master

gitcc rebase //rebase again and its resolved.

It seems to me that gitcc should include a command to automatically do this (probably in a more efficient manner)

[charleso]

Hi Jeromy,

Yeah, git-cc does't handle merge conflicts very well. It'd be nice to be able to register a hook into git for when the merges are resolved to complete the transaction automatically. I suppose the easy alternative is, as you've suggested adding a separate command. Probably something like 'gitcc resolved' which ensures everything is tidied up.

I should warn you I'm not actively adding features to git-cc, mainly because I haven't touched Clearcase in a few years now. I'm happy to accept a patch if someone sends me one though - sorry about that.

Charles

[whyrusleeping]

Ill see about working on a patch, my python is rusty but I will give it a shot.