Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upRemove some code that redefined mac_dev_ref_unit_factory incorrectly. #109
+0
−10
Conversation
|
@bors-servo r+ |
|
|
bors-servo
pushed a commit
that referenced
this pull request
Sep 2, 2015
Remove some code that redefined mac_dev_ref_unit_factory incorrectly. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/109) <!-- Reviewable:end -->
|
|
Manishearth
pushed a commit
that referenced
this pull request
Mar 9, 2016
GitHub recently added a feature called "protected branches", which is not compatible with the current Homu flow. The main problem is that there is no way to mark a merge commit that is not yet pushed to a remote repository as "success". Until GitHub adds such functionality, work around the issue by pushing the merge commit to a temporary branch and resetting the target branch to the merge commit. Protected branches also conflict with the "fake merge" feature, as it forbids force-pushing. This cannot be solved mechanically, so inform the user in such cases. Fixes #109.
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.
Ms2ger commentedSep 2, 2015