Github user lresende commented on the issue:
https://github.com/apache/bahir-flink/pull/35
@eskabetxe if you update to latest master and try to rebase this, do you
get any conflicts ?
This is what I am getting :
```
First, rewinding head to replay your work on top of it...
Applying: BAHIR-114: update flume to 1.8 and add some tests
Using index info to reconstruct a base tree...
M .travis.yml
M flink-connector-flume/README.md
M flink-connector-flume/pom.xml
M
flink-connector-flume/src/main/java/org/apache/flink/streaming/connectors/flume/FlumeSink.java
M pom.xml
Falling back to patching base and 3-way merge...
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging
flink-connector-flume/src/test/java/org/apache/flink/streaming/connectors/flume/FlumeSinkTest.java
CONFLICT (add/add): Merge conflict in
flink-connector-flume/src/test/java/org/apache/flink/streaming/connectors/flume/FlumeSinkTest.java
Auto-merging .travis.yml
CONFLICT (content): Merge conflict in .travis.yml
error: Failed to merge in the changes.
Patch failed at 0001 BAHIR-114: update flume to 1.8 and add some tests
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
```
---
