Open
Description
I need to implement following flow:
git merge -s ours --no-commit BRANCH \
&& git read-tree -m -u BRANCH \
&& do_some_changes \
&& git commit
I was doing first 2 steps manually (well -- with direct git commands) and then git commit using GitPython to come to realization that it nohow cared about those .git/MERGE*
left by git merge --no-commit . Note that it would also be necesary/preferable to allow to not specify commit message for subsequent commit command since generic one for merging should suffice in my cases.