New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebase merge conflicts #18

Open
whyrusleeping opened this Issue Aug 1, 2012 · 2 comments

Comments

Projects
None yet
2 participants
@whyrusleeping

whyrusleeping commented Aug 1, 2012

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

This comment has been minimized.

Show comment
Hide comment
@charleso

charleso Aug 1, 2012

Owner

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

Owner

charleso commented Aug 1, 2012

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

This comment has been minimized.

Show comment
Hide comment
@whyrusleeping

whyrusleeping Aug 2, 2012

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

whyrusleeping commented Aug 2, 2012

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment