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

Re: branch practice in my project

From
PJ Weisberg <pj@irregularexpressions.net>
Date
Aug 28, 2011, 19:42 UTC
Message-ID
<CAJsNXTmWmuycf0+vJ_TqcnQSoB1uNpexOJc=Av4OvZ=v_cAVFA@mail.gmail.com>
In-Reply-To
<CAPgpnMQmLUcxfNBDO53=s1SfigJtq2zk4H+npZeX0B_Vf0FAuA@mail.gmail.com>
On Sun, Aug 28, 2011 at 2:23 AM, Lynn Lin <lynn.xin.lin@gmail.com> wrote:
> how to get the data back to master branch?   I  suggest we can merge
> release branch back, and others are afraid that merge conflict will be
> a big deal for us so they suggest we can double commit into master and
> release branch

I don't see how anyone would think "double commits" would be *less* work than resolving merge conflicts. (Espically if most changes don't even conflict.)

The only reason I can think of for not merging release back into master is if there are some changes on release that you don't want in master.

-PJ
Previous: Lynn Lin
Message 2 of 2 in “branch practice in my project”
  1. Lynn LinAug 28, 2011
  2. PJ WeisbergAug 28, 2011

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.