diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0c558de --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +proj2a/tmp/ diff --git a/README b/README index 5ee7327..51a99db 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ This is the first version of README Adding a line in the develop branch Adding another line to the develop branch +A fourth line in develop \ No newline at end of file diff --git a/fork.txt b/fork.txt new file mode 100644 index 0000000..874ea5c --- /dev/null +++ b/fork.txt @@ -0,0 +1,10 @@ +A file added to a fork of gitlab2345 +Edit made to file +Add this line in original repo +Add this line in fork +modify in master branch +Add line in TGT-999 +Add line in TGT-999 after first push to fork +Add line in TGT-1001 +Add ine in fork-001_master +Add line in repo-001 diff --git a/new.txt b/new.txt new file mode 100644 index 0000000..e5c9ffe --- /dev/null +++ b/new.txt @@ -0,0 +1,2 @@ +A second text file. +An edit in original repo. diff --git a/proj2a/proj2-1.txt b/proj2a/proj2-1.txt new file mode 100644 index 0000000..e69de29 diff --git a/projNew/proj1-1.txt b/projNew/proj1-1.txt new file mode 100644 index 0000000..e69de29 diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..16a8885 --- /dev/null +++ b/test.txt @@ -0,0 +1,8 @@ +2018-06-06 +Add line in master. +Insert line in dev. +Update in repo. +Update in repo after start of TGT-999. +Update in fork master for TGT-1000. +Try to update in 8a1a17 commit +Arrg