new

README.md

@@ -1 +1,33 @@
-# sourcery-dev-2020
+<h1>sourcery-dev-2020</h1>
+
+<ol>
+  <li>Clone/Pull repository</li>
+  <li>Create your branch. Name it like ‘feature/name-surname’</li>
+  <li>Switch to that branch.</li>
+  <li>Create a folder with your name like name-surname.</li>
+  <li>Go to that folder. All changes you make will be inside this folder.</li>
+  <li>Create a helloWorld.txt file with the text ‘Hello World!’</li>
+  <li>Commit that file with message ‘My first commit’</li>
+  <li>Push this code to repo</li>
+  <li>Create a branch from your feature branch called conflict/name-surname</li>
+  <li>Go to your conflict branch ( conflict/name-surname )</li>
+  <li>Change helloWorld.txt file contents to ‘Hello World from merge-conflict branch!’</li>
+  <li>Commit and push your changes</li>
+  <li>Go back to your feature branch ( feature/name-surname )</li>
+  <li>Change the contents of helloWorld.txt file to ‘Hello from feature branch!’</li>
+  <li>Commit and push your changes</li>
+  <li>Merge merge-conflict brach into your feature branch ( feature/name-surname )</li>
+  <li>Resolve conflicts with your favourite editor. Your finished helloWorld.txt file contents should be:\
+  ’Hello from feature branch!\
+  and\
+  Hello from merge-conflict branch!\
+  after successful merge conflict’</li>
+  <li>Commit and push your resolved merge conflict</li>
+  <li>You should have your feature branch with the helloWorld.txt file and it’s contents:\
+  ’Hello from feature branch!\
+  and\
+  Hello from merge-conflict branch!\
+  after successful merge conflict’</li>
+  <li>Go to repo page and check your commit history to see how it looks visually and that all steps were done successfully.</li>
+  <li>Create a pull Request to merge your feature branch to master</li>
+</ol