- Create a new branch with
git checkout -b branch-name.
- Push your feature branch to the remote (cloud) repository with
git push origin branch-name.
- Make changes with
git add modified-file and git commit -m "commit message".
- Resolve any merge conflicts by following the instructions here.
- Submit a merge/pull request by following these instructions for GitLab and these instructions for GitHub.
- When the review is complete, accept the pull request (on GitLab or GitHub and merge the changes into the main branch.
- Delete the new feature branch (on both the remote reposotory and your local copy) with
git push -d remote-name branch-name followed by git branch -d branch-name. remote-name is the name of the remote (cloud) repository and will usually be origin by default.