Skip to content

Fix faulty conflict resolution #7527

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
Closed
wants to merge 1 commit into from
Closed

Fix faulty conflict resolution #7527

wants to merge 1 commit into from

Conversation

dunglas
Copy link
Member

@dunglas dunglas commented Feb 24, 2017 •
edited
Loading

Restore dd29e89

javiereguiluz
javiereguiluz approved these changes Feb 27, 2017
View reviewed changes
Copy link
Member

@javiereguiluz javiereguiluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

xabbuh added a commit that referenced this pull request Feb 28, 2017
@xabbuh
minor #7527 Fix faulty conflict resolution (dunglas)
f306a3c 
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #7527).

Discussion
----------

Fix faulty conflict resolution

Restore dd29e89

Commits
-------

febdde0 Fix faulty conflict resolution
@xabbuh
Copy link
Member

xabbuh commented Feb 28, 2017

Thanks Kévin, I have merged this into the 2.8 branch where the rest of the broken conflict resolution was already fixed by #6471.

@xabbuh xabbuh closed this Feb 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@javiereguiluz javiereguiluz javiereguiluz approved these changes

Assignees
No one assigned
Labels
Status: Reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dunglas @xabbuh @javiereguiluz @carsonbot