Hands on#
Git Merge Conflict#
Resolve Git Merge Conflict
1. Create a new git repository and a new file in it.
2. Create two new branches call "test2" and "test3".
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.
4. After commit two branches, switch back to the main.
5. Start to merge main and test2
6. Then we merge main and test3, but the conflict happen.
7. Fix the conflict manually.
8. After resolve the conflict, remember to add it, commit it, then push it.
9. Now everything is great!!
10.
Merge Request#
Merge Request
1. Main branch and origin Markdown file
2. Change content and push to gitlab.
3. Create a new merge request
4. Code reviewer will check the change and commit it if there is problem.
5. After the problem fixed, manager can merge the code.
6. Merge completed.
7.
Issue Tracking & Milestones#
Issues and Milestones
1. Create the new issue.
2. In the issue page, developer can create the new merge request and fix the problem there.
3. After merge request completed, the issue will close at the same time.
4. Milestone
5. Create the new issue and add description
6. Issue boards
7. Issues and milestone
8. Personal boards
9.