- Ensure local repo is up-to-date:
git fetch origin
- Create feature branch
git checkout -b my-feature-branch
- Make changes and commit:
git add .
git commit -m "Added new feature"
- Ensure the local main is up to date:
git checkout main
git pull origin main
- Merge main onto feature branch
git checkout my-feature-branch
git merge main
- Resolve conflicts, add and commit.
- Push your update to the remore repository
git push origin my-feature-branch
- Open pull request