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

Re: Integration-Manager Workflow

From
MPMichael Poole <mdpoole@troilus.org>
Date
Jan 16, 2010, 19:06 UTC
Message-ID
<87r5ppx42f.fsf@troilus.org>
In-Reply-To
<201001161849.32211.aribao@gmail.com>
Adrián Ribao Martínez writes:
> What happens if they accidentally work in the develop branch instead of creating a new one? What should we do?
> I think I should never fetch from teamx.myserver.net to avoid this problem and instead track the branch like in step 2. Is this correct?
It is simpler than that.

If you just use "git remote add teamx teamx.myserver.net:/...." (rather than cloning your integration repository from one of those repositories), it will leave all your local branches alone -- any changes to teamx.myserver.net's "develop" branch will only show up in the teamx/develop tracking branch.

The reason is that a fetch or pull only merges into your develop branch if your branch.develop.merge git-config entry specifies an upstream branch -- more detail can be found in the git-config man page under branch.<name>.remote and branch.<name>.merge.

Those entries are set up when you clone from a repository, and through some other commands, but if teamx clones from the integration server, they can only mess up their own develop branch. If/when you push into teamx's repository from yours, you can forcibly overwrite any of those accidental changes. (Normally, though, the push would only do a fast-forward merge -- so if teamx made such a mistake, the merge will fail until you address the mismatch.)

Michael Poole
Previous: Adrián Ribao MartínezNext: Adrián Ribao Martínez
Message 2 of 4 in “Integration-Manager Workflow”
  1. Adrián Ribao MartínezJan 16, 2010
  2. Michael PooleJan 16, 2010
  3. Adrián Ribao MartínezJan 16, 2010
  4. Michael PooleJan 17, 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.