Skip to content

/ GitPython

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wishlist: allow for merge --no-commit and then delayed commit during merge #361

Open
yarikoptic opened this issue Nov 3, 2015 · 2 comments
Open

wishlist: allow for merge --no-commit and then delayed commit during merge #361

yarikoptic opened this issue Nov 3, 2015 · 2 comments
Labels
acknowledged help wanted

Comments

@yarikoptic
Copy link
Collaborator

@yarikoptic yarikoptic commented Nov 3, 2015

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.
@Byron
Copy link
Member

@Byron Byron commented Nov 8, 2015

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.
@yarikoptic
Copy link
Collaborator Author

@yarikoptic yarikoptic commented Feb 5, 2016

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 ;)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
acknowledged help wanted
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
@yarikoptic @Byron
You can’t perform that action at this time.