Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
rebase merge conflicts #18
I just thought I would share a solution to a problem I had encountered.
It seems to me that gitcc should include a command to automatically do this (probably in a more efficient manner)
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.