70 lines (47 loc) · 1.1 KB

Practice Test - Merging Branches

Take me to Practice Test

Solutions to practice test - merging branches

Run cd /home/sarah/story-blog; git checkout master and then list the files ls
Details
```
$ cd /home/sarah/story-blog
$ git checkout master
$ ls
```
Run cd /home/sarah/story-blog and then list the files ls
Details
```
$ cd /home/sarah/story-blog
$ ls
```
Run git branch
Details
```
$ git branch
```

Run git log

Details

$ git checkout master
$ git log
$ git checkout story/frogs-and-on
$ git log

Run git merge story/frogs-and-ox. Check git log now and it should show commit message as Merge branch 'story/frogs-and-ox' into master
Details
```
$ git checkout master
$ git merge story/frogs-and-ox
$ git log
```
List the files in the master branch and make sure both the stories are visible.
Details
```
$ ls
```