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 to master on release handle conflicts correctly #187

Closed
erwint opened this issue Dec 3, 2018 · 0 comments
Closed

When merging to master on release handle conflicts correctly #187

erwint opened this issue Dec 3, 2018 · 0 comments

Comments

@erwint
Copy link
Member

erwint commented Dec 3, 2018

If for some reason there is a conflict, we should use the version from develop. It's already intended like this, but uses ours instead of theirs. Also, normally there should be no conflicts, as there should be no commits on master between releases.
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

No branches or pull requests
1 participant
@erwint