sourcery-dev-2021

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

Most common commands cheat sheet

• git status - shows the current status and relavent data
• git add pathToFile - moves specified changes to staging area
• git add . - moves all current changes to staging area
• git commit -m "message" - moves changes from staging area to commit history
• git push - updates remote repository with commit history from your local repository
• git push --set-upstream origin branchName - creates an istance of your local branch in remote
• git pull - updates your local repository with commit history from remote repository
• git branch branchName - creates a new branch in local repository
• git checkout branchName/hash - moves to the specified branch or commit
• git merge branchName - merge specified branch commit history into current branch