Skip to content
Snippets Groups Projects
Commit 3fd69194 authored by Marina Popleteeva's avatar Marina Popleteeva
Browse files

Add merge slide and remove empty templates

parent 1d42e7c2
No related branches found
No related tags found
2 merge requests!134[release] Regular merge of develop,!122git part 2
Showing with 17 additions and 10 deletions
2022/2022-06-07_git-trilogy-part-2/slides/img/MRright.png

55.6 KiB

2022/2022-06-07_git-trilogy-part-2/slides/img/MRwrong.png

46.5 KiB

2022/2022-06-07_git-trilogy-part-2/slides/img/mergeCheck.png

175 KiB

2022/2022-06-07_git-trilogy-part-2/slides/img/mergePublishedBranch.png

100 KiB

2022/2022-06-07_git-trilogy-part-2/slides/img/mergeRepoBranches.png

218 KiB

[
{ "filename": "index.md" },
{ "filename": "overview.md" },
{ "filename": "why.md" },
{ "filename": "ssh.md" },
{ "filename": "workflow.md" },
{ "filename": "fork.md" },
{ "filename": "VSCodeGUI.md" },
......@@ -11,7 +11,6 @@
{ "filename": "commit.md" },
{ "filename": "push.md" },
{ "filename": "merge.md" },
{ "filename": "ssh.md" },
{ "filename": "test.md" },
{ "filename": "merge2.md" },
{ "filename": "thanks.md" }
]
# Merge your changes to original repository - via **Merge Request**
Now your cahnges are in your fork on the server. You want to incorporate it into original repository. Create **Merge Request**.<br>
- If you just published branch, simply click "Create merge request"<br>
<img height="230px" src="slides/img/mergePublishedBranch.png"><br>
- If worked sometime, go to Repository > Branches and click "Merge request"<br>
<img height="330px" src="slides/img/mergeRepoBranches.png">
\ No newline at end of file
# Merge Request
- Make sure you are merging *new* branch in **your fork** to *develop* branch in **original repository**<br>
<img height="130px" src="slides/img/MRwrong.png">
<img height="130px" src="slides/img/MRright.png">
- Give meaninfull title (start with "Draft:" if you are planning to continue work on this feature).
- Ticke "Delete source branch when merge request is accepted." if finished work on this feature.
- Crosscheck:<br>
<img height="430px" src="slides/img/mergeCheck.png">
\ No newline at end of file
# Overview
0. Subject 1
1. Subject 2
# Presentation Title
oij;laisjdlaksjd
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment