Editing Branches

A Branch View

If you have switched to another branch, and you are working in that branch, it works just like the master branch. You can make changes and edits and do commits.

Git allows you to easily break up your work.

Merging Branches

Without merging, branches are useless. Merging is the most important topic when you talk about branches.

Merging the branch you are currently on

Before doing anything, it's a good idea to check the status of your branch. You do not want any conflicts.

To merge, simply use the command git merge [branch to merge with] [branch you are on].

Example

git merge master feat/header

The above code merges the header feature in to the master branch.

git merge feat/header fix/header

The above code merges the fixed things to the header feature.