-
Notifications
You must be signed in to change notification settings - Fork 60
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
Conflictresolution within the same component #64
Conversation
During conflict resolution, only try accepting change sets from the same component. As a consequence, already accepted change sets need to be skipped.
… into conflictresolution
From #52
Lets break the compatibility with 3.3 and disable the build of it. Couple of months ago I wrote in the readme that python 3.4 is required. So I think it shouldnt be a big deal. |
Conflictresolution within the same component - fixes #52
In case of a conflict, it makes sense to only propose change sets from the same component.
This pull request implements this.
Fixes #52