Conflictresolution within the same component#64
Merged
WtfJoke merged 15 commits intortcTo:developfrom Sep 21, 2015
Merged
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
Member
|
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. |
WtfJoke
added a commit
that referenced
this pull request
Sep 21, 2015
Conflictresolution within the same component - fixes #52
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In case of a conflict, it makes sense to only propose change sets from the same component.
This pull request implements this.
Fixes #52