debian-mirror-gitlab/doc/university/training/topics/merge_conflicts.md

67 lines
1.6 KiB
Markdown
Raw Normal View History

2018-03-17 18:26:18 +05:30
---
comments: false
---
2017-08-17 22:00:37 +05:30
# Merge conflicts
- Happen often
- Learning to fix conflicts is hard
- Practice makes perfect
- Force push after fixing conflicts. Be careful!
2019-10-12 21:52:04 +05:30
## Merge conflicts sample workflow
2017-08-17 22:00:37 +05:30
1. Checkout a new branch and edit `conflicts.rb`. Add 'Line4' and 'Line5'.
2019-02-15 15:39:39 +05:30
1. Commit and push.
1. Checkout master and edit `conflicts.rb`. Add 'Line6' and 'Line7' below 'Line3'.
1. Commit and push to master.
1. Create a merge request and watch it fail.
1. Rebase our new branch with master.
1. Fix conflicts on the `conflicts.rb` file.
1. Stage the file and continue rebasing.
1. Force push the changes.
1. Finally continue with the Merge Request.
2017-08-17 22:00:37 +05:30
2020-03-13 15:44:24 +05:30
```shell
2017-08-17 22:00:37 +05:30
git checkout -b conflicts_branch
# vi conflicts.rb
# Add 'Line4' and 'Line5'
git commit -am "add line4 and line5"
git push origin conflicts_branch
git checkout master
# vi conflicts.rb
# Add 'Line6' and 'Line7'
git commit -am "add line6 and line7"
git push origin master
```
Create a merge request on the GitLab web UI. You'll see a conflict warning.
2020-03-13 15:44:24 +05:30
```shell
2017-08-17 22:00:37 +05:30
git checkout conflicts_branch
git fetch
git rebase master
# Fix conflicts by editing the files.
git add conflicts.rb
# No need to commit this file
git rebase --continue
# Remember that we have rewritten our commit history so we
# need to force push so that our remote branch is restructured
git push origin conflicts_branch -f
```
## Note
2019-03-02 22:35:43 +05:30
2019-12-21 20:55:43 +05:30
- When to use `git merge` and when to use `git rebase`
2019-03-02 22:35:43 +05:30
- Rebase when updating your branch with master
- Merge when bringing changes from feature to master
2019-12-21 20:55:43 +05:30
- Reference: <https://www.atlassian.com/git/tutorials/merging-vs-rebasing>