Github user ottobackwards commented on the issue:
https://github.com/apache/metron/pull/668
So, to resolve the conflicts what I would usually do is:
```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
---------
Is that close to what you are doing? What are you doing differently? What
are the issues you are having?
---
