Branching and Merging: Practice

Branching and Merging: Practice & Reading

Dealing with a merge conflict

I've set up a very basic website project on GitHub. It has two branches, and I have set up the files that they will give you a merge conflict when you try to merge them to give you practice.

Bring down the branches

1. Clone this repository: https://github.com/katebron/class_merge_demo
2. Run git branch -a to see all the branches
3. To automatically set up a new branch and pull my additional GitHub branch into it, run
git checkout change_index
4. Run git diff to see the differences betwen the two branches

Merge the branches

In this exercise, I'd like you to merge the change_index branchinto master. Try to do this part on your own - feel free to Google. I will have 'solutions' next week.

• Move to master
• Merge change_index into master
• Deal with the merge conflict

Articles to Read

Please read one or both of these articles and post to the forum about one thing you've learned, or one thing you want to learn more about.

• 14 Tips and Tools to resolve merge conflicts with Git
• A successful Git branching model

Want to learn more? Try out additional commands & merge tool

Try out a merge tool or other strategy for dealing with merges and conflicts (see article above). Post to the forum about it.