rebase develop after cherry-pick to release

rebase develop after cherry-pick to release

For the discussion of infrastructure improvements and changes.

Moderator: Moderators

Post Reply
cleanrock
Former Engine Dev
Posts: 115
Joined: 21 Feb 2009, 07:42

rebase develop after cherry-pick to release

Post by cleanrock » 03 Mar 2013, 09:02

I think we can avoid the reverts when merging back release onto develop:

1. cherry-pick a bunch of commits from develop to release
# git checkout release
# gitk --all (right click the commits on develop to cherry-pick to release)

2. rebase develop
# git checkout develop
# git rebase release

http://davitenio.wordpress.com/2008/09/ ... e-commits/
0 x

User avatar
jK
Spring Developer
Posts: 2299
Joined: 28 Jun 2007, 07:30

Re: rebase develop after cherry-pick to release

Post by jK » 04 Mar 2013, 20:18

tried it and it gave me an never ending horror of merge conflicts :<
0 x

Post Reply

Return to “Infrastructure Development”