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

Try to solve simple conflicts #10

Open
krystof-k opened this issue Sep 20, 2018 · 0 comments
Open

Try to solve simple conflicts #10

krystof-k opened this issue Sep 20, 2018 · 0 comments

Comments

@krystof-k
Copy link
Member

PR Merger is failing in cases where every PR is making a change in the same file, e.g. changelog, Gemfile or components export (that's our case in React repo).

It'd be great if it tries to solve those, probably addition-only conflicts, and therefore merge even branches with conflicting files

Possibly a union merge could be used for this.
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
@krystof-k