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.

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

forced rebase before merge #133

Closed
oxarbitrage opened this issue Sep 18, 2019 · 1 comment
Closed

forced rebase before merge #133

oxarbitrage opened this issue Sep 18, 2019 · 1 comment

Comments

@oxarbitrage
Copy link

oxarbitrage commented Sep 18, 2019

Currently, pull requests to the develop branch need to be rebased before being merged.

A msg will show:
This branch is out-of-date with the base branch

And no merge will be possible until that is done. This is a bit annoying as each time the develop is updated will force you to do that on each pull even if no related change was done.
It is also noisy as it will be adding this merge commits to the history.

I am not against them but i was wondering if there is any good reason to have it like this. Thanks.

@RoshanSyed
Copy link

RoshanSyed commented Sep 20, 2019

Thanks for the suggestion. It was mostly implemented to resolve some PR conflicts we had. But at this state I agree with you. This has been taken care of, and now you are not forced to rebase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants