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

Re: With feature branches, what is ever committed directly to master

From
Steven E. Harris <seh@panix.com>
Date
Aug 13, 2010, 22:19 UTC
Message-ID
<m2ocd6yx3h.fsf@Spindle.sehlabs.com>
In-Reply-To
<AANLkTinwQhD-b0-6uQYwBa3r7psNvPp5LMcjqHVKLF+c@mail.gmail.com>
Jon Seymour <jon.seymour@gmail.com> writes:
> Otherwise, I keep them clean and merge them into the base of my
> working branch (as described into an earlier note).  By always merging
> into the base of my working branch (and never the tip) I can keep my
> working tree stable and my patches clean.

Can you clarify what you mean by "merging into the base" and "never the tip"? Perhaps a pointer to the earlier note you mentioned would suffice.

-- 
Steven E. Harris
Previous: Jon SeymourNext: Jon Seymour
Message 5 of 9 in “With feature branches, what is ever committed directly to master”
  1. Bradley WagnerAug 10, 2010
  2. Michael WittenAug 10, 2010
  3. David RiptonAug 11, 2010
  4. Jon SeymourAug 11, 2010
  5. Steven E. HarrisAug 13, 2010
  6. Jon SeymourAug 13, 2010
  7. Magnus BäckAug 11, 2010
  8. Jon SeymourAug 11, 2010
  9. Tim VisherAug 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.