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

Re: cookbook question

From
Kyle Rose <krose@krose.org>
Date
Feb 28, 2008, 23:08 UTC
Message-ID
<47C73ED3.6000704@krose.org>
In-Reply-To
<20080228225838.GA31479@hashpling.org>
Show 10 quoted lines
> I presume that origin/common contains changes to the common part of
> the config files that you want to apply to both machines. If the two
> machines' configs were originally branched from origin/common and then
> had there custom changes made and committed, you should just be able
> to merge subsequent changes from origin/common and not get conflicts
> unless there are genuinely changes to the parts of the configs that
> have been modified for the individual machines. I don't see a case for
> rebase in your example.
>
>

The rebase just avoids unnecessary merge records. What I really want is my changes placed on top of whatever the common head is at any one time, which by design means I would use rebase. Aside from the cleanliness of the history, I'm not sure there is a real reason to do this. But I like things clean. ;-)

Kyle
Previous: Charles BaileyNext: Charles Bailey
Message 3 of 4 in “cookbook question”
  1. Kyle RoseFeb 28, 2008
  2. Charles BaileyFeb 28, 2008
  3. Kyle RoseFeb 28, 2008
  4. Charles BaileyFeb 28, 2008

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.