Skip to content

GitLab

Unverified Commit 2060576e authored by Francisco Massa's avatar Francisco Massa Committed by GitHub
Browse files

Change approach for rebase to master (#1427)

parent a141363f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
.circleci/config.yml
View file @ 2060576e
......@@ -20,8 +20,7 @@ commands:
set -ex
BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ "$BRANCH" != "master" ]]; then
git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
git checkout "merged/$CIRCLE_BRANCH"
git merge origin/master
fi
binary_common: &binary_common
......
.circleci/config.yml.in
View file @ 2060576e
......@@ -20,8 +20,7 @@ commands:
set -ex
BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ "$BRANCH" != "master" ]]; then
git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
git checkout "merged/$CIRCLE_BRANCH"
git merge origin/master
fi
binary_common: &binary_common
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment