(cassandra-3.11)mshuler@hana:~/git/cassandra$ git merge --no-commit cassandra-3.0
Auto-merging test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
Auto-merging test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
CONFLICT (content): Merge conflict in test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
Auto-merging test/unit/org/apache/cassandra/cql3/validation/entities/UFScriptTest.java
Auto-merging src/java/org/apache/cassandra/db/rows/BTreeRow.java
CONFLICT (content): Merge conflict in src/java/org/apache/cassandra/db/rows/BTreeRow.java
Auto-merging src/java/org/apache/cassandra/db/filter/ColumnFilter.java
CONFLICT (content): Merge conflict in src/java/org/apache/cassandra/db/filter/ColumnFilter.java
Auto-merging src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
Auto-merging src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
CONFLICT (content): Merge conflict in src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Auto-merging src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
Automatic merge failed; fix conflicts and then commit the result.
(cassandra-3.11 *+|MERGING)mshuler@hana:~/git/cassandra$ git merge --abort 
(cassandra-3.11)mshuler@hana:~/git/cassandra$