Summary - Merge and rebase

Combine both approaches to choose the right merge strategy.

Summary of merge and rebase strategies

Merge and rebase strategies shape the historical readability of your project. git merge preserves branching points for a strictly truthful tree, while git rebase replays commits to maintain a clean and linear timeline. Rebasing on local feature branches and merging into the shared trunk is the most common industry practice.

# Clean up local branch (rebase)
git rebase main
# Integrate into main trunk (merge)
git merge --no-ff ozellik

Remember the golden rule: Never rebase a branch shared with others.

Exercise Complete rebase and integration flow

Rebase the ozellik branch with git rebase -q main, switch to main, merge with git merge -q ozellik, and print history using git log --format="%s".

Show example solution

git init -q
git config user.name "Kaan"
git config user.email "kaan@example.com"
echo "temel" > app.py
git add app.py
git commit -qm "Ilk temel"

git checkout -qb ozellik
echo "eklenti" > eklenti.py
git add eklenti.py
git commit -qm "Ozellik hazirlandi"

git checkout -q main
echo "yama" > yama.txt
git add yama.txt
git commit -qm "Hata yamasi"

git checkout -q ozellik

git rebase -q main
git checkout -q main
git merge -q ozellik
git log --format="%s"

Test yourself

What is the most balanced approach in a team to keep a local branch up to date and then integrate it into main?
- Rebase on the main branch and use merge on the local branch
- Delete the entire history and squash everything into a single commit
- Update the local branch with rebase and join the main branch with merge
- Reset the shared branches on the remote repository daily with rebase
Show answer

Update the local branch with rebase and join the main branch with merge — Rebasing locally keeps history clean and linear; merging into main clearly documents the feature integration.
Continue rebase after conflict resolution
```
git rebase ____
```
Show answer
```
git rebase --continue
```
Strategy matching

Fast-forward

Advances branch tip without divergence
Rebase felsefesi

Provides linear and simple history
Merge felsefesi

Preserves all branch points fully
İki ebeveyn

Core structure of merge commits

Next lesson: Conflict markers

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies