Re: Pushing patches to staging

[Carl Sorensen]

On 11/12/11 3:08 PM, "Graham Percival" <address@hidden> wrote:

>
>
>The only problem is to develop a series of simple commands to do
>this task.

Here's my set of simple commands:

git checkout master
git pull origin master
git apply my_patch_file_name_goes_here
git checkout staging
git pull origin staging
git cherry-pick master
git push origin staging

These commands will work, unless some patch already applied to staging has
messed with the files in such a way that the cherry-pick fails.  When the
cherry-pick fails, I don't know of a way to do it without thinking.  At
that point, thought will be necessary.  Most often I will finish the
cherry-pick by doing

git mergetool

And solving the merge conflicts that show up, then committing the results
using the command that git gave me in the error message that said the
cherry-pick wouldn't apply.

Thanks,

Carl