Skip to content

Instantly share code, notes, and snippets.

@fmsf

fmsf/gist:4539675

Created January 15, 2013 15:59
Show Gist options
  • Save fmsf/4539675 to your computer and use it in GitHub Desktop.
Save fmsf/4539675 to your computer and use it in GitHub Desktop.
Download ZIP
git rebased merge
Raw
gistfile1.txt
Let's say I have a branch "my-feature" (which only exists locally on my PC!) that I want to merge now into "master":
- Make sure that my master branch is at the most recent version (i.e. fetch/pull master branch)
- Rebase branch "my-feature" on "master" (resolving conflicts where necessary)
- Switch to "master" branch (checkout)
- Merge the rebased "my-feature" branch into master, with option "--no-ff" (i.e. "git merge --no-ff my-feature")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment