Changes

Page history
Update Contributing to Gryphon authored by Allen, Bruce (CIV)'s avatar Allen, Bruce (CIV)
Show whitespace changes
Inline Side-by-side
Contributing-to-Gryphon.md
View page @ bf9a3c4f
...@@ -60,5 +60,6 @@ Once your branch is uploaded, create a pull request on GitLab (GitLab calls this ...@@ -60,5 +60,6 @@ Once your branch is uploaded, create a pull request on GitLab (GitLab calls this
* At this point, your merge request is submitted and shows up in the merge list under "Merge requests" in the GitLab repository's home at https://gitlab.nps.edu/monterey-phoenix/user-interfaces/gryphon/-/tree/master. * At this point, your merge request is submitted and shows up in the merge list under "Merge requests" in the GitLab repository's home at https://gitlab.nps.edu/monterey-phoenix/user-interfaces/gryphon/-/tree/master.
## Merging pull requests into master ## Merging pull requests into master
* An assigned developer reviews 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 approve the pull request. * Once reviewed, the assigned developer may click "approve" to approve the pull request, after which it may be merged into master.
\ No newline at end of file * 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.
\ No newline at end of file