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

Re: Branching workflow

From
Javier Domingo <javierdo1@gmail.com>
Date
Dec 3, 2013, 19:25 UTC
Message-ID
<CALZVapkvVNxb-jJssZqjT-Y8sApK8O1pe3xTB8guNtx9Md2W6Q@mail.gmail.com>
In-Reply-To
<xmqq8uw1oij6.fsf@gitster.dls.corp.google.com>

I will start to rebase all feature branches because I have no real dependency on those, but master needs to have a linear history, as I build from it regularly, and I need to assure that people can get a previous version of master.

The problem with that is that I wouldn't be able to have a linear history on master. I had also thought about doing a snapshot branch of the integration branch, so that I could maintain history of integration, and just update it with integration snapshots, but I am trying to get another more git-ish way to achieve all these requirements of all branches (they are really driving me crazy).

Thanks a lot for the idea. I will mantain clean feature branches from now on,
Javier Domingo Cansino
Previous: Junio C HamanoNext: Javier Domingo Cansino
Message 5 of 7 in “Branching workflow”
  1. Javier DomingoDec 3, 2013
  2. John KeepingDec 3, 2013
  3. Javier DomingoDec 3, 2013
  4. Junio C HamanoDec 3, 2013
  5. Javier DomingoDec 3, 2013
  6. Javier Domingo CansinoSep 22, 2014
  7. Junio C HamanoSep 25, 2014

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.