git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Integration-Manager Workflow and merges

From
Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Date
May 1, 2010, 04:44 UTC
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:

Show 6 quoted lines
>
> 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.

Previous: Dmitrijs Ledkovs
Message 3 of 3 in “Integration-Manager Workflow and merges”
  1. Sebastian Andres Mancilla MattaMay 1, 2010
  2. Dmitrijs LedkovsMay 1, 2010
  3. Dmitrijs LedkovsMay 1, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.