This repository has been archived by the owner on Apr 18, 2018. It is now read-only.
Add rerun detection button #92
Merged
Conversation
This file contains 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
|
This looks ok for now. We could probably figure out some way to prevent rerunning merge conflct detection if master hasn't changed. But this is good enough. |
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
Add rerun detection button Allow pushmasters to manually trigger merge-detection. Useful when a previous push has certed.
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
Merged
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
Release 0.3.3 BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
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.
Add a button to the pushmaster UI for pushes that will kick off conflict detection again for all the pickmes in the push. This would be useful for rechecking the push against a previous push that has just certed.