Guide for pulling from->to git branches

git-branch-merging.md

Pulling the same branch

If you're pulling the same branch from origin (origin/develop -> develop):

git checkout develop
git fetch origin
git pull --no-commit --log --rebase origin develop

---

SourceTree options:

• Commit merge immediately (if no conflicts) --no-commit
• Include messages from commits being merged in merge commit --log
• Create a commit even if merge resolved via fast-forward
• Rebase instead of merge --rebase

Cross-branch

Otherwise, always create a merge commit for merges like origin/feature/ISSUE-123 -> develop:

git checkout develop
git fetch origin
git merge --log --no-ff origin/feature/ISSUE-123

---

SourceTree options:

• Commit merge immediately (if no conflicts)
• Include messages from commits being merged in merge commit --log
• Create a commit even if merge resolved via fast-forward --no-ff
• Rebase instead of merge