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

Rerun merge conflict detection when a push is certed #86

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

Rerun merge conflict detection when a push is certed #86

ymilki opened this issue Aug 18, 2014 · 0 comments

Comments

@ymilki
Copy link
Member

ymilki commented Aug 18, 2014

If there are multiple simultaneous pushes, if one push is certed, merge conflict detection should be rerun.

If this proves to be too taxing on the queue, perhaps add a button to manually trigger a rerun over all existing pickmes (if the master sha has indeed changed).
ymilki added a commit that referenced this issue Aug 18, 2014
@ymilki
Release 0.3.3
67aa4d6 
 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 issue Aug 18, 2014
@ymilki
Release 0.3.3
f41a274 
 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 ymilki mentioned this issue Aug 18, 2014
Merged
ymilki added a commit that referenced this issue Aug 18, 2014
@ymilki
Release 0.3.3
539518f 
 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 issue Aug 18, 2014
@ymilki
Merge pull request #93 from Yelp/release-candidate
cc1016a 
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.
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@ymilki