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

Conflictresolution within the same component #64

Merged
merged 15 commits into from
Sep 21, 2015

Conversation

ohumbel
Copy link
Member

@ohumbel ohumbel commented Sep 21, 2015

In case of a conflict, it makes sense to only propose change sets from the same component.
This pull request implements this.
Fixes #52

@WtfJoke
Copy link
Member

WtfJoke commented Sep 21, 2015

From #52

But the usage of enum is only supported from python 3.4 on (see https://docs.python.org/3/library/enum.html). Therefore the python 3.3 build fails. I did not know that, and enum came in handy.

There are 2 ways to fix that:

disable the 3.3 build
do not use enum

@WtfJoke Manuel what do you propose?

IMHO it is acceptable to require a quite recent version of python.

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
@WtfJoke WtfJoke merged commit eed802c into rtcTo:develop Sep 21, 2015
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

Successfully merging this pull request may close these issues.

2 participants