2 posts tagged โ€œgitโ€

How to merge multiple Git repos and keep their commit history

I wanted to merge several different repos into a single monorepo, while preserving their commit histories. Here's how I did it.

Rebasing against a feature branch with Git cherry-pick

Contributing to a feature branch that periodically gets rebased against master can lead to rebase hell. Hereโ€™s how to recover gracefully with `git cherry-pick`