sourcery-dev-2020

1. Clone/Pull repository
2. Create your branch. Name it like ‘feature/name-surname’
3. Switch to that branch.
4. Create a folder with your name like name-surname.
5. Go to that folder. All changes you make will be inside this folder.
6. Create a helloWorld.txt file with the text ‘Hello World!’
7. Commit that file with message ‘My first commit’
8. Push this code to repo
9. Create a branch from your feature branch called conflict/name-surname
10. Go to your conflict branch ( conflict/name-surname )
11. Change helloWorld.txt file contents to ‘Hello World from merge-conflict branch!’
12. Commit and push your changes
13. Go back to your feature branch ( feature/name-surname )
14. Change the contents of helloWorld.txt file to ‘Hello from feature branch!’
15. Commit and push your changes
16. Merge merge-conflict brach into your feature branch ( feature/name-surname )
17. 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’
18. Commit and push your resolved merge conflict
19. 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’
20. Go to repo page and check your commit history to see how it looks visually and that all steps were done successfully.
21. Create a pull Request to merge your feature branch to master