leitura rápida
Git Merge
Merge
(no fast-foward)
git checkout -b feature-new-branch master
git add .
git commit -m "primeiro commit"
git add .
git commit -m "segundo commit"
git checkout master
git merge feature-new-branchgit checkout master
git commit -a -m "adiciona um commit na master atoa"Merge
(squash commit)
git checkout -b feature-new-branch master
git add .
git commit -m "primeiro commit"
git add .
git commit -m "segundo commit"
git checkout master
git merge feature-new-branch --squashgit checkout master
git commit -a -m "adiciona um commit na master atoa"
Merge
(rebase)
git checkout -b feature-new-branch main
git add .
git commit -m "primeiro commit"
git add .
git commit -m "segundo commit"
git rebase main
git checkout main
git merge feature-new-branch --ff-onlygit checkout main
git commit -a -m "adiciona um commit na master atoa"
Merge
(semi-linear)
git checkout -b feature-new-branch master
git add .
git commit -m "primeiro commit"
git add .
git commit -m "segundo commit"
git rebase master
git checkout master
git merge feature-new-branch --no-ffgit checkout master
git commit -a -m "adiciona um commit na master atoa"
Felipe F. Rocha
felipefonsecarocha@gmail.com
