Merging

Merging branch A into branch B

• git checkout B

• git merge A

Merge and Squash

• git merge --squash A

  -it merges and squash all commits into one new commit