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

Preventing merges from one branch into others

From
TCTim Chase <git@tim.thechases.com>
Date
Feb 7, 2013, 19:14 UTC
Message-ID
<20130207131440.716c1022@bigbox.christie.dr>

[tried IRC to no avail] I've been trying to find a way to prevent myself from merging a client-specific branch back into my dev/master branches. Is there an easy/straightforward way to do this (perhaps via a hook)? I didn't see any sort of "pre-merge" hook script. Visualized:

  A -> B -> C [dev]
   \
    -> Q -> R -> S [customer-specific]

and I want to ensure that changes Q/R/S never find their way back into dev.

So I was hoping some sort of "hey, you're an idiot for trying to merge $CUSTOMER_BRANCH back into dev/master" warning. :-)

-tkc
Next: Junio C Hamano
Message 1 of 2 in “Preventing merges from one branch into others”
  1. Tim ChaseFeb 7, 2013
  2. Junio C HamanoFeb 7, 2013

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.