From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
To: Sebastian Andres Mancilla Matta <smancill@alumnos.inf.utfsm.cl>
Cc: git@vger.kernel.org
Subject: Re: Integration-Manager Workflow and merges
Date: Sat, 1 May 2010 05:44:09 +0100 [thread overview]
Message-ID: <p2u86ecb3c71004302144w942be5f6p9ce8f431653338f7@mail.gmail.com> (raw)
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.
prev parent reply other threads:[~2010-05-01 4:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-01 0:02 Integration-Manager Workflow and merges Sebastian Andres Mancilla Matta
2010-05-01 4:40 ` Dmitrijs Ledkovs
2010-05-01 4:44 ` Dmitrijs Ledkovs [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=p2u86ecb3c71004302144w942be5f6p9ce8f431653338f7@mail.gmail.com \
--to=dmitrij.ledkov@ubuntu.com \
--cc=git@vger.kernel.org \
--cc=smancill@alumnos.inf.utfsm.cl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).