Introduce 'dry-merge' command #141
Conversation
It shows if an automatic merge would succeed and which files could be automatically merged. It stops at the first conflict which needs a manual merge. Including bash completion for dry-merge.
|
Interesting idea. What is the use-case for such a command? Would you use it before you do a merge? If your answer is yes, I just wonder if another approach which involves "asking for forgiveness instead of permission" would be more sensible. I chose the optimistic approach, which is doing the merge and if something goes horribly wrong just I can see the use case in situations where you cannot afford to risk a conflict during a merge (such as shell scripts). |
|
My main use case is when working on a feature branch feature/foo. Ideally I want to see if there were conflicts introduced between feature/foo and feature/bar. I want to see a list of files or even better: the exact lines. Then I can rethink what I am about to do and ask my colleagues working on feature/bar because I know our versions diverged. In addition I know if I may need help for a merge before starting it. All in all I see it as a complement to And yes, |
|
@jups23 Still interested? |
|
This PR was closed because it has been stalled for 365 days with no activity. Feel free to make a new PR if you wish to continue |
I would appreciate a command to check if a merge can be performed automatically or which files need manual merging. In this pull request I already implemented a simple version of it.
Proposal:
git dry-merge <branchname>prints which files can be automatically merged and which files need a manual merge.Current Implementation
It currently just runs
Future Work
It should check the result of
git merge --no-commit --no-ff $1. If it states 'Already up-to-date' it exits and prints no 'fatal: There is no merge to abort (MERGE_HEAD missing)'.In addition it should not stop at the first 'error: Your local changes to the following files would be overwritten by merge' and just print one file that would be overwritten but ALL the files that would be overwritten.
What is your opinion about it?
Note: I was inspired by: http://stackoverflow.com/questions/501407/