From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Date: Sat, 01 May 2010 04:44:09 GMT
Subject: Re: Integration-Manager Workflow and merges
Message-ID: <p2u86ecb3c71004302144w942be5f6p9ce8f431653338f7@mail.gmail.com>
In-Reply-To: <4BDB6FA1.4070802@alumnos.inf.utfsm.cl>

On 1 May 2010 01:02, Sebastian Andres Mancilla Matta
<smancill@alumnos.inf.utfsm.cl> wrote:
>
> This way, there is no duplicated merges. Is this a good workflow? Can
> anyone using a similar approach give me some comments?
>
> Thanks.
>

Don't worry about duplicate merges. Allow everyone to pull from each other =)

The "duplicate" merge will not make you to resolve the same conflicts
again if you are worried about that.