Mastering Git & GitHub: Professional Team Workflow, Rebasing & Merge Strategies

Why Clean Git History Matters for Teams

In collaborative software teams, a disorganized Git history full of "fix bug", "typo", and "test" commits makes tracing regressions with git bisect almost impossible. Establishing structured commit conventions and mastering rebasing maintains a linear, legible project timeline.

Merge vs. Rebase: The Architectural Difference

• Git Merge: Creates an explicit merge commit that ties two diverged branch histories together. Preserves the exact chronological order of commits, but results in tangled commit graphs in active teams.
• Git Rebase: Replays your branch's commits one by one on top of the latest target branch commit. Produces a completely linear history, making code reviews and rollbacks straightforward.

Interactive Rebase: Cleaning Commits Before Submitting a PR

Before submitting a Pull Request to your team repository, squash temporary commits into meaningful atomic units:

# Rebase the last 4 commits interactively
git rebase -i HEAD~4

Inside your terminal editor, select actions:

pick 8a2f3b1 feat(auth): implement biometric biometric prompt
squash c109b44 fix typo in biometric callback
squash 99fba21 add missing null check
pick e442a98 test(auth): add unit test for authentication repository

Standard Branching Conventions (GitHub Flow)

1. main / master: Production-ready, deployable code at all times. Protected branch requiring 1+ peer reviews.
2. feature/feature-name: Branch branched from latest main.
3. fix/issue-description: Quick bug patches.

Resolving Merge Conflicts Safely

When conflicts arise during rebasing against origin/main:

# Update local main
git checkout main && git pull origin main

# Rebase feature branch
git checkout feature/payment-gateway
git rebase main

# After fixing conflict markers in editor:
git add src/PaymentService.kt
git rebase --continue

# Push cleanly to remote feature branch
git push origin feature/payment-gateway --force-with-lease

Always use --force-with-lease rather than raw --force to prevent accidentally overwriting peer commits.