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

Clarifications for merge workflows

From
MEMarkus Elfring <markus.elfring@web.de>
Date
Mar 11, 2010, 11:12 UTC
Message-ID
<4B98D015.40401@web.de>
Hello,

Some informations are available in the manual about distributed content management workflows. http://kernel.org/pub/software/scm/git/docs/gitworkflows.html#_merge_workflow

I find that a few details are missing to achieve a better understanding for the merging of branches.

Use case:
A contributor pushes an update suggestion from the personal repository "ABC" to
a topic branch in a public repository "SHARE" on a separate server. An
integrator reviews the proposed changes. If they are accepted, the integrator
will choose a repository where the merge should be performed next.
- Log-in to the server and integrate the updates there.
  or
- Fetch the remote topic branch into the integrator's own local repository
"XYZ", merge there and push the result back to the server.

Which ways do you recommend to select the storage location where a merge will be applied first?

Regards, Markus

Next: Junio C Hamano
Message 1 of 3 in “Clarifications for merge workflows”
  1. Markus ElfringMar 11, 2010
  2. Junio C HamanoMar 11, 2010
  3. Markus ElfringMar 11, 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.