Skip to content

Instantly share code, notes, and snippets.

@dbist
Last active October 2, 2017 21:32
Show Gist options
  • Save dbist/b216c2b1cfececadc0ece199e8380931 to your computer and use it in GitHub Desktop.
Save dbist/b216c2b1cfececadc0ece199e8380931 to your computer and use it in GitHub Desktop.
```bash
> cd metron
> git checkout pr-branch
# make sure i have all the master changes
> git fetch apache
# rebase on to master
> git rebase -i apache/master
..... resolve conflicts .....
> git rebase --continue
# verify build
> mvn clean && time mvn -q -T 2C -DskipTests install && time mvn -q -T 2C surefire:test@unit-tests && time mvn -q surefire:test@integration-tests && time mvn -q test --projects metron-interface/metron-config && time build_utils/verify_licenses.sh
# important -> -f flag is required after rebase
# push
> git push -f origin pr-branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment