Skip to content
This repository has been archived by the owner on Apr 18, 2018. It is now read-only.

Merge conflict detection for pipelined push requests #87

Open
ymilki opened this issue Aug 18, 2014 · 0 comments
Open

Merge conflict detection for pipelined push requests #87

ymilki opened this issue Aug 18, 2014 · 0 comments

Comments

@ymilki
Copy link
Member

ymilki commented Aug 18, 2014

If a pull request ("B") contains another pull request ("A"), then merge ordering matters. Because "B"'s branch contains "A"'s branch, if pull request "B" is merged first, then pull request "A" will result in a noop on merge and should be an error in some way.

The merge conflict detection should be able to recognize this scenario and error out.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant