lab 28 Merging
- Learn how to merge two diverging branches to bring the changes back into a single branch.
Merge the branches
Merging brings the changes in two branches together. Let’s go back to the greet branch and merge master onto greet.
git checkout greet git merge master git hist --all
$ git checkout greet Switched to branch 'greet' $ git merge master Merge made by the 'recursive' strategy. README | 1 + 1 file changed, 1 insertion(+) create mode 100644 README $ git hist --all * a87176d 2020-06-20 | Merge branch 'master' into greet (HEAD -> greet) [Jim Weirich] |\ | * 8d90176 2020-06-20 | Added README (master) [Jim Weirich] * | 228a31e 2020-06-20 | Updated Rakefile [Jim Weirich] * | 98cfd8a 2020-06-20 | Hello uses Greeter [Jim Weirich] * | cf0438b 2020-06-20 | Added greeter class [Jim Weirich] |/ * 5aec14d 2020-06-20 | Added a Rakefile. [Jim Weirich] * 721b979 2020-06-20 | Moved hello.rb to lib [Jim Weirich] * 907a445 2020-06-20 | Add an author/email comment [Jim Weirich] * 4254c94 2020-06-20 | Added a comment (tag: v1) [Jim Weirich] * c8b3af1 2020-06-20 | Added a default value (tag: v1-beta) [Jim Weirich] * 30c2cd4 2020-06-20 | Using ARGV [Jim Weirich] * 4445720 2020-06-20 | First Commit [Jim Weirich]
By merging master into your greet branch periodically, you can pick up any changes to master and keep your changes in greet compatible with changes in the mainline.
However, it does produce ugly commit graphs. Later we will look at the option of rebasing rather than merging.
But first, what if the changes in master conflict with the changes in greet?