Merge code from one branch to another
- Open up a git repository
- Create a new branch:
git checkout -b develop
- Change something in your code
- Commit and Push (as usual)
- Set your upstream
git push --set-upstream origin develop
- Go to Github
- Open a Pull Request (either with the pop up or go to the pull request tab)
- Resolve conflicts (if they exist)
- Merge from develop to main