Skip to content

Hands on#

Git Merge Conflict#

Resolve Git Merge Conflict

1. Create a new git repository and a new file in it.
Create new repository and file
2. Create two new branches call "test2" and "test3".
Create two new branches
3. Switch to other branches, add some text, then commit. When we switch to test2 or test3, we only can see the text from main.
switch and add in test2 switch to test3 switch and add test3
4. After commit two branches, switch back to the main.
Commit and then switch back to the main
5. Start to merge main and test2
Merge main and test2
6. Then we merge main and test3, but the conflict happen.
Conflict happen
7. Fix the conflict manually.
Fix the conflict manually.
8. After resolve the conflict, remember to add it, commit it, then push it.
Conflict resolve
9. Now everything is great!!
Everything is GOOD!
10. 😄

Merge Request#

Merge Request

1. Main branch and origin Markdown file
Origin file Only one branch here
2. Change content and push to gitlab.
Change content in merge.md There is a new branch which is named merge Switch to merge branch
3. Create a new merge request
Create merge request Add detail
4. Code reviewer will check the change and commit it if there is problem.
Check the change Add commit
5. After the problem fixed, manager can merge the code.
Change local file and push it again Developer also can reply the commit Start merge
6. Merge completed.
Merge completed
7. 😄

Issue Tracking & Milestones#

Issues and Milestones

1. Create the new issue.
Create the new issue
2. In the issue page, developer can create the new merge request and fix the problem there.
Create the new merge request
3. After merge request completed, the issue will close at the same time.
Issue resolved
4. Milestone
Milestone
5. Create the new issue and add description
Create the new issue
6. Issue boards
Issue boards
7. Issues and milestone
Milestone
8. Personal boards
Personal boards
9. 😄