Remote tracking branches for merge detection cannot handle rebased branches #85

ymilki · 2014-08-18T02:32:00Z

If a branch is rebased, the next time merge conflict detection is run on the request, the git fetch will fail to fetch due to non-fastforward.

The fetch should include a + in the refspec. See http://git-scm.com/docs/git-fetch and the second EXAMPLES.

asottile · 2014-08-18T15:52:48Z

The failure mode of this is a git-error tag

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)

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)

ymilki mentioned this issue Aug 18, 2014

Release 0.3.3 #93

Merged

asottile closed this as completed Aug 19, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remote tracking branches for merge detection cannot handle rebased branches #85

Remote tracking branches for merge detection cannot handle rebased branches #85

ymilki commented Aug 18, 2014

asottile commented Aug 18, 2014

Remote tracking branches for merge detection cannot handle rebased branches #85

Remote tracking branches for merge detection cannot handle rebased branches #85

Comments

ymilki commented Aug 18, 2014

asottile commented Aug 18, 2014