This repository has been archived by the owner on Apr 18, 2018. It is now read-only.
Release 0.3.3 #93
Merged
Release 0.3.3 #93
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
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.
BUG FIXES
Don't run merge detection on merged requests (rschlaikjer, Previously certed branches are showing up as
conflict-master#84, Check if pickmes are already merged into master, and if so ignore them #91)Fetch non-ff branches (rschlaikjer, Remote tracking branches for merge detection cannot handle rebased branches #85, Fetch non-ff changes #90)
IMPROVEMENTS
Manually rerun merge detection (rschlaikjer, Rerun merge conflict detection when a push is certed #86, Add rerun detection button #92)
PERFORMANCE TWEAKS
Separate git sha retrieval from git merge conflict detection.
(rschlaikjer, SHA fetching can be very slow if conflict checking is happening #82, Make verify realtime #83)