Commit e4932957 authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

added images for merge request instruction

parent 2e9e8e30
Pipeline #225 passed with stages
in 16 seconds
...@@ -214,8 +214,15 @@ Workflow with ``dev`` branch ...@@ -214,8 +214,15 @@ Workflow with ``dev`` branch
To https://csst-tb.bao.ac.cn/code/csst-l1/csst_proto.git To https://csst-tb.bao.ac.cn/code/csst-l1/csst_proto.git
d9f64d3..bbed3fa main -> main d9f64d3..bbed3fa main -> main
.. note:: As a developer, you can also create a merge requrest to ask code reviewers to merge your changes on GitLab.
As a developer, you can also create a merge requrest to ask code reviewers to merge your changes on GitLab.
Click ``Merge requests`` tag, click `` First, click ``Merge requests`` tag, click ``
.. image:: vcs/merge_request.png
.. image:: vcs/merge_request.png Second, select source branch and target branch, create a new merge request.
.. image:: vcs/create_merge_request.png
The code reviewers should then view the chagnes, and decide whether the changes should be approved.
.. image:: vcs/create_merge_request.png
If the changes are accepted, approve and merge the changes into `main` branch.
.. image:: vcs/merge_approve.png
After the changes have been merged, code reviewers should leave comment on the changes.
.. image:: vcs/merged.png
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment