diff --git a/destination b/destination new file mode 100644 index 0000000..81996a9 --- /dev/null +++ b/destination @@ -0,0 +1,5 @@ +<<<<<<< HEAD +Feature 1 +======= +Feature 2 +>>>>>>> branchB diff --git a/feature1.txt b/feature1.txt new file mode 100644 index 0000000..d04f4c8 --- /dev/null +++ b/feature1.txt @@ -0,0 +1 @@ +Feature 2 \ No newline at end of file diff --git a/feature2.txt b/feature2.txt new file mode 100644 index 0000000..89356ee --- /dev/null +++ b/feature2.txt @@ -0,0 +1 @@ +New feature \ No newline at end of file