Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Conversation

KiChjang
Copy link

Review on Reviewable

barosl and others added 28 commits November 26, 2015 23:38
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.
Make delegate command insensitive
Original pull request: #118
@Manishearth
Copy link
Member

We can merge after I get confirmation about 97c0424 and I test it independently on servo-master.

Manishearth added a commit that referenced this pull request Jan 31, 2016
@Manishearth Manishearth merged commit e07f74e into master Jan 31, 2016
@Manishearth Manishearth deleted the upstream-update branch January 31, 2016 07:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants