Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
# 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
@mikesorae
Copy link
Author

mikesorae commented Aug 11, 2015

git flowでffしてるとこ

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment