From: William Lasiewicz I am looking for a script to merge selected checkins from one branch to another. We have a script that does this in perforce, but we want to switch to git ( because its free) I am looking in to it and the cherrypick command looks like what I am lookng for. Developers will check in to the staging branch and we we are satisfied with the changes, we want to merge those checkin to release. We won't want to merge the whole branch only certain checkin ( in perforce they are changelists)
Any ideas? The Git way is to get the developers, on their local working branch, to locally rebase (polish) their work, such that the upstream reviewers (when they push that branch up to the public repo for review) can then take the change in a nice easy merge. There are variants of how upstream recieves and integrates the branches, but the key learning is to get the individual dev's to do more (because they can, and they feel better having the approriate freedoms ;-) The classic post is http://nvie.com/posts/a-successful-git-branching-model/ (have a look more at what the devs are doing at this stage) Philip -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
