On Sun, Sep 30, 2012 at 9:24 PM, Eric Firing wrote:
> On 2012/09/30 7:14 AM, Michael Droettboom wrote:
>> On 09/29/2012 08:07 PM, Eric Firing wrote:
>>> Mike,
>>>
>>> I'm getting confused about branch merge strategy. Usually, it seems
>>> that it has been to periodically merge the maintenance bra
On 2012/09/30 7:14 AM, Michael Droettboom wrote:
> On 09/29/2012 08:07 PM, Eric Firing wrote:
>> Mike,
>>
>> I'm getting confused about branch merge strategy. Usually, it seems
>> that it has been to periodically merge the maintenance branch into
>> master. Something like this:
>>
>> git fetch up
On 09/29/2012 08:07 PM, Eric Firing wrote:
> Mike,
>
> I'm getting confused about branch merge strategy. Usually, it seems
> that it has been to periodically merge the maintenance branch into
> master. Something like this:
>
> git fetch upstream
> git checkout master
> git merge --ff-only upstr
Mike,
I'm getting confused about branch merge strategy. Usually, it seems
that it has been to periodically merge the maintenance branch into
master. Something like this:
git fetch upstream
git checkout master
git merge --ff-only upstream/master
git merge upstream/v1.2.x
# test, commit changes
