Merging Step by Step
Learn how to merge two branches in your git repository.
Step 1: Creating a repository, adding some files, and committing them
Take a look at the following slides and see how merging takes place:
You can run through the same kind of scenario step-by-step by following these commands:
1 mkdir -p
...