CODEWITHSUNDEEP
gitsvn
Stefano Borini
Stefano Borini

Reputation: 143865

Bringing changes to an experimental branch from a new commit in git svn

I have the following git svn situation.

  1. master, checked out from svn.
  2. branched devel branch, on which I did some changes. Some are git committed, some are still not committed.
  3. I had to solve a bug, so I stashed my non-committed stuff, switched branch to master, git svn rebase to update, created and switched to a branch bugfix.
  4. fixed the bug in bugfix, committed.
  5. switched to master, svn merge from bugfix.
  6. git svn dcommit.
  7. Now I am ready to resume my work in devel, however I want to bring the recent bugfix in my branch without messing up things.

What should I do now, in order to guarantee I don't mess up everything when I finally end my work in devel and merge --squash onto master followed by the dcommit ? I am not ready to linearize, so I cannot do a git rebase on devel from the master (which would, as far as I get, put all my changes from devel in front of the latest master.

Upvotes: 1

Views: 56

Answers (1)

Yanflea
Yanflea

Reputation: 3934

Wouldn't a simple git cherry-pick of your bugfix commit do the trick ?

Upvotes: 1

Related Questions