You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
I think for now, it would be easiest to workaround using the git-commit command itself (e.g. repo.git.commit(...). The pure-python commit implementation GitPython comes with could be altered to respect additional files, even though I won't be able to do it due to this library being in maintenance mode.
ah, I haven't realized actually that GitPython is not under active development -- good job maintaining, but then I guess I would need to figure out how to proceed having such a realization now ;)
I need to implement following flow:
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.The text was updated successfully, but these errors were encountered: