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

Previously certed branches are showing up as conflict-master #84

Closed
asottile opened this issue Aug 18, 2014 · 1 comment
Closed

Previously certed branches are showing up as conflict-master #84

asottile opened this issue Aug 18, 2014 · 1 comment

Comments

@asottile
Copy link
Contributor

should be simple enough to check whether the sha is already contained in master before checking conflicting / non-ff
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)
@asottile
Copy link
Contributor Author

asottile commented Jul 9, 2017

Seems fixed at some point 0.3.3?

@asottile asottile closed this as completed Jul 9, 2017
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
@asottile