Skip to content
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.

Sign up for GitHub

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

When merging batches, fast fordwarding is enabled #255

Closed
mathyoudawson opened this issue Apr 25, 2020 · 0 comments · Fixed by #256
Closed

When merging batches, fast fordwarding is enabled #255

mathyoudawson opened this issue Apr 25, 2020 · 0 comments · Fixed by #256

Comments

@mathyoudawson
Copy link
Contributor

Fast forward only is enabled when merging batches. This is problematic as when reverting a change included in a batch, every commit associated with the change must be reverted rather than just the merge commit.

There should be some configuration so that fast-forwarding can be disabled when merging batches.

https://github.com/smarkets/marge-bot/blob/master/marge/batch_job.py#L145
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Add argument to disable fast forwarding of batch merges mathyoudawson/marge-bot
1 participant
@mathyoudawson