Skip to main content

Merge ↔ to combine multiple Branch

aka Merged

Fast-Forward Merge​

Merge strategy to move pointer to Head w/o need to resolve Conflict

Conflict​

when 2 Commits to Merge overwrite same file, git unsure which Branch to keep

References​

  1. Conflict ↔ when 2 Commits to Merge overwrite same file, git unsure which Branch to keep

  2. merge ↔ to Merge Branches

  3. Fast-Forward Merge ↔ Merge strategy to move pointer to Head w/o need to resolve Conflict

  4. -d ↔ flag to safely delete Branch only if not already Merged into Master

  5. -D ↔ flag to force delete Branch ignore if Merged into Master

  6. --abort ↔ flag to cancel Merge

  7. git merge --abort ↔ to abort Merge & return to original state before Merge (especially when unsure in Conflict)

  8. Pull Request ↔ to ask Upstream author to review/Merge Fork Diff

  9. rebase ↔ to rewrite Commit History to simplify/linearize Merge

  10. CI ↔ (Paradigm) to frequently Merge in small maintable chunks via CI Server