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
Ask for confirmation before staging unmerged file containing markers #464
A feature request: everyone has it happen every few times that they're dealing with some Unmerged changes.
Sometimes I do make the mistake of double-clicking such a file in git-cola, which will automatically stage it with these markers:
Unstaging won't put it back in the "Unmerged" state though, meaning that I can no longer call
Since I don't think git allows to put a file back to the Unmerged state, could git-cola detect that a file still has markers and ask the user for confirmation or even give the third option of opening the mergetool?
This is a great idea. It's totally possible. When implementing, please make sure to also consider the "diff3"-style conflict markers, which are enabled by