From da884ed8a5c32ba0068308b8f7493119078af6de Mon Sep 17 00:00:00 2001 From: bitblt Date: Tue, 7 Feb 2017 22:20:09 -0600 Subject: [PATCH 1/2] initial commit for v2 --- README.md | 4 +++- dir1/file2.txt | 1 - dir1/file3.txt | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 dir1/file2.txt create mode 100644 dir1/file3.txt diff --git a/README.md b/README.md index b01ead6..798c769 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,6 @@ Dummy repository for training purposes Adding more content just another line so i have content for editing when i branch. -and this is the last line for this commit \ No newline at end of file +and this is the last line for this commit + +This changed was made in version2 branch diff --git a/dir1/file2.txt b/dir1/file2.txt deleted file mode 100644 index 7b9db74..0000000 --- a/dir1/file2.txt +++ /dev/null @@ -1 +0,0 @@ -this is file2.txt diff --git a/dir1/file3.txt b/dir1/file3.txt new file mode 100644 index 0000000..76b8900 --- /dev/null +++ b/dir1/file3.txt @@ -0,0 +1 @@ +this is file3. It was added in the branch and file2 was deleted. From 5d6eec6d9c8499a9ab3247c9cdbdafda9895b277 Mon Sep 17 00:00:00 2001 From: bitblt Date: Tue, 7 Feb 2017 22:23:06 -0600 Subject: [PATCH 2/2] commit2 --- README.md | 5 +++-- abc.txt | 2 ++ def.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 def.txt diff --git a/README.md b/README.md index 798c769..ff6a350 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ # github-essentials -Dummy repository for training purposes + +Training repository for GitHub training purposes Adding more content just another line so i have content for editing when i branch. and this is the last line for this commit -This changed was made in version2 branch +This line was added in version2 branch diff --git a/abc.txt b/abc.txt index 89d0c70..eb2479b 100644 --- a/abc.txt +++ b/abc.txt @@ -2,3 +2,5 @@ a new file that was added after the repo was created. I added additional lines after "adding" the file to github but before committing the change. This is another line of text. + +Added another changed for v2.1 diff --git a/def.txt b/def.txt new file mode 100644 index 0000000..75195d6 --- /dev/null +++ b/def.txt @@ -0,0 +1 @@ +added this file in v2.1