- Fork repository ( fork icon in top right corner in github )
- Clone/Pull repository fork from your account ( Top right corner code button - use SSH type )
- Once cloning is complete, check, that you have a folder with the name sourcery-2022-FE-FALL-KAUNAS in working directory.
- Go into that directory. In git bash/terminal you should see the name of the folder and the branch name (main)
- Create your branch. Name it like ‘feature/name-surname’
- Switch to that branch.
- Create a folder with your name like name-surname. ( You can use unix commands or use file explorer to create folders and files ).
- Go to that folder. All changes you make will be inside this folder.
- Create a helloWorld.txt file with the text ‘Hello World!’
- Commit that file with message ‘My first commit’
- Push this code to repo
- Create a branch from your feature branch called conflict/name-surname
- Go to your conflict branch ( conflict/name-surname )
- Change helloWorld.txt file contents to ‘Hello World from merge-conflict branch!’
- Commit and push your changes
- Go back to your feature branch ( feature/name-surname )
- Change the contents of helloWorld.txt file to ‘Hello from feature branch!’
- Commit and push your changes
- Merge merge-conflict brach into your feature branch ( feature/name-surname )
- 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’ - Commit and push your resolved merge conflict
- 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’ - Go to repo page and check your commit history to see how it looks visually and that all steps were done successfully.
- Create a pull Request to merge your feature branch to master
mancefas / sourcery-2022-fe-fall-kaunas Goto Github PK
View Code? Open in Web Editor NEWThis project forked from paumur/sourcery-2022-fe-fall-kaunas