Joining Branch

JOINING BRANCH, TWO WAYS:

• Merge:

$ git merge "branch name"

e.g:

$git merge functionality1

Note: This way it may occur that you have to commit to the branches, it does not bring commits made to the other branch in a visual way, being proven to use the < git log>.

• Rebase:

It joins the branches, but without having to commit warning that joined the branches, in addition , it brings the commits made in the branch, also orders the history, make a < git log > to view.

$ git rebase "branch name"

e.g

$git rebase functionality1

Depending on the merge, there may be conflict, then I will also explain what rebase is.