This repository was archived by the owner on Mar 20, 2024. It is now read-only.
forked from barosl/homu
-
Notifications
You must be signed in to change notification settings - Fork 49
Upstream update #11
Merged
Merged
Upstream update #11
Conversation
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
KiChjang
commented
Jan 25, 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.
Instead of adding an empty merge commit, modify the commit message of every commit in a pull request.
It seems that the Travis commit gets garbage collected after some time.
GitHub occasionally returns 500 Internal Server Error.
Fix debug logging.
Make delegate command insensitive
Original pull request: #118
fffa517
to
ef32b42
Compare
We can merge after I get confirmation about 97c0424 and I test it independently on servo-master. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.