Skip to content

Commit

Permalink
Rewrite done recipe for new merge workflow
Browse files Browse the repository at this point in the history
The new sign-preserving merge workflow is to just
wait until commits pass CI, and then push directly
to master on GitHub.

type: development
  • Loading branch information
casey committed Apr 8, 2020
1 parent 9d43fa4 commit b16da8d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ push: check

# clean up feature branch BRANCH
done BRANCH=`git rev-parse --abbrev-ref HEAD`:
git checkout master
git diff --no-ext-diff --quiet --exit-code
git pull --rebase github master
git push github {{BRANCH}}:master
git checkout master
git rebase {{BRANCH}}
git diff --no-ext-diff --quiet --exit-code {{BRANCH}} --
git branch -D {{BRANCH}}
git branch -d {{BRANCH}}

test:
cargo test --all
Expand Down

0 comments on commit b16da8d

Please sign in to comment.