You can create a new feature branch with a given name with this command:
1$ git branch feature/add-a-subscribe-button
You can list all the branches in your repository:
1$ git branch
Switch to a desired branch, by providing its name:
1$ git checkout my_branch
Merge a branch "_a" into branch "_b". It automatically selects the changes and applies to the branch _b. If conflicts occur (having changes on the same place in a certan file), you should resolve them manually. by picking the changes you want to leave or remove.
1$ git checkout branch_b
2$ git merge branch_a
And if you want to see the differences you made inside your branch, compared to the parent branch, you can use:
1$ git diff
Or, to see changes between two specific commits, by using their unique commit IDs:
1$ git diff commit1 commit2
You can also list the change dates, and the author of the changes, if you need to see when someone performed a change, on a specific file:
1$ git show [commit]:[file]
Or simply view the full change history:
1$ git log