Press the fork button at the top right and name it
File -> Clone Repository and search up name of repository (Github-Workshop or the name you gave it in this case)
- Press on current branch main
- Click on new branch
- Give it a name
- Write something here:
- You can open the repo by going to repository and then open in explorer. (Can also press Ctrl+Shift+A to open in text editor)
- Open the readme.md
- Write something in the line above
- Save and then open github desktop
- You will see a change on the left
- Press Publish branch
- Give it a commit message and press commit
- Then press push to origin in top right
- Press Preview Pull Request
- Press Create Pull Request
- Finish the pull request description and name on github
- Make sure that at the top right you choose the main branch you want to merge to, not the thigamore/github-workshop, instead /github-workshop
- and create the pull request
- Then, if you press pull requests on github, you can see all the pull requests that lets you merge (combine) the two branches
- Create a new branch
- Make a new file in that branch
- Go to github desktop, press current branch and choose the main
- Then go back to current branch, and at the bottom there is a button to merge into main
- Choose the new branch and make a merge commit
- Check this in github
- Go to github and press edit on the readme.md
- Check the checkbox above
- Press commit changes
- Now go to github desktop and fetch origin
- The press pull origin
- Go to History on the left
- Right click on the commit where you forked the branch and press checkout commit
- Now you are on an old commit
- Make a new branch
- Edit the readme with in the first commit and write something different than what you wrote before
- Commit and Push
- Then make a pull request
- You will have a merge conflict
- Try to merge the pull request and press on resolve conflicts
- Delete the text you don't want
- Press reolve conflict
- Then Merge the pull request