diff --git a/README.md b/README.md index 343480ce0..e4062fc87 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ +<<<<<<< HEAD +This ia a Demo Project list. +Merge-Conflict in Git +<<<<<<< HEAD +======= +This is a Demo Project list. +Merge-Conflict in Git +A New Edit in README.md +>>>>>>> 84a93dc... Commit Done for Repo B +======= +A New Edit in README.md +>>>>>>> 16d3bb4... SECOND TIME COMMIT Mega Project List ======== diff --git a/file1.txt b/file1.txt new file mode 100644 index 000000000..547fa2ba8 --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +Hello, this is the first file in development branch diff --git a/file2.txt b/file2.txt new file mode 100644 index 000000000..2e6957d51 --- /dev/null +++ b/file2.txt @@ -0,0 +1 @@ +Hello, this is file2 in feature branch diff --git a/file3.txt b/file3.txt new file mode 100644 index 000000000..b872dfda9 --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +This file3 added in development branch !