To merge a development branch into the current branch, use “git merge dev-branch-name”. If you get conflict warnings about a merge, use “git merge –abort” to back out of it, or edit the affected files and then commit them.
Git uses branches to isolate development streams, to prevent the stable release branch from becoming polluted. Bringing work in a branch into the main stream means merging branches. Here’s how you do it.
Git was designed to make branching simple and fast. In contrast to other version control systems, branching on Git is a trivial matter. On multi-developer projects especially, branching is one of Git’s core organizational tools.
Branches sandbox new development efforts so that code can be modified or added without affecting the code in other branches, especially the main or master branch. This usually contains the stable version of your code base.
Isolating these changes from your stable code version makes perfect sense. But sooner or later the new code will be tested, reviewed, and rubber-stamped to be rolled into the master branch. At that…
Read Full Article Source