@@ -62,4 +62,4 @@ Once your branch is uploaded, create a pull request on GitLab (GitLab calls this
...
@@ -62,4 +62,4 @@ Once your branch is uploaded, create a pull request on GitLab (GitLab calls this
## Merging pull requests into master
## Merging pull requests into master
* An assigned developer will review your pull request and may ask questions or request changes.
* An assigned developer will review your pull request and may ask questions or request changes.
* Once reviewed, the assigned developer may click "approve" to approve the pull request, after which it may be merged into master.
* Once reviewed, the assigned developer may click "approve" to approve the pull request, after which it may be merged into master.
* Before merging, be sure that the branch is up to date with master. If it is not, there may be change conflicts and the merge operation will be denied. Before merging, issue "git pull" to bring the branch up to date with master. Then merge the branch.
* Before merging, though, be sure that the branch is up to date with master. If it is not, there may be change conflicts and the merge operation will be denied. Before merging, issue "git pull" to bring the branch up to date with master. Then merge the branch.