Created
August 11, 2015 08:16
-
-
Save mikesorae/ec8db8fa37e361a1f64e to your computer and use it in GitHub Desktop.
This file contains hidden or 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
| # merge into BASE | |
| git checkout "$DEVELOP_BRANCH" | |
| if [ "$(git rev-list -n2 "$DEVELOP_BRANCH..$BRANCH" | wc -l)" -eq 1 ]; then | |
| git merge --ff "$BRANCH" | |
| else | |
| git merge --no-ff "$BRANCH" | |
| fi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
git flowでffしてるとこ