Master DevOps Tools with Real Practice

# === MERGE WORKFLOW ===
# On your feature branch, merge main into it
git checkout feature-branch
git merge main
# Creates a merge commit — history shows the branch

# Or merge the feature into main
git checkout main
git merge feature-branch

# === REBASE WORKFLOW ===
# On your feature branch, rebase onto main
git checkout feature-branch
git rebase main
# Replays your commits on top of main — linear history

# Then fast-forward merge into main
git checkout main
git merge feature-branch

# === GOLDEN RULE ===
# Never rebase commits that have been pushed to a shared branch
# Only rebase YOUR local, unpushed commits