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

Question concerning merge behavior

From
DDefcon0 <patzer.dennis@googlemail.com>
Date
Jul 26, 2012, 11:30 UTC
Message-ID
<1343302234333-7563780.post@n2.nabble.com>
Hello,
I'm quite new to git and have the following situation:

I have a master- and a productive-branch. The productive-branch lives on a server (productive environment) and the master is for the devs to play around ;-) Hot fixes and patches are primarily done in the productive branch. New features are done in the master branch.

Now the question is, let's say, I did a stability fix in the productive-branch and want that one also in the master branch (which contains several new features). Will I have conflicts then with files modified in the master- but not in productive-branch? Or will only the modified files from the productive branch be compared with the master branch (and not the modified ones in master)?

And do you think my branching in all makes sense (master for features, branch for production environment)?

Big thanks in advance for any help!!
Bye Defcon0

-- View this message in context: http://git.661346.n2.nabble.com/Question-concerning-merge-behavior-tp7563780.html Sent from the git mailing list archive at Nabble.com.

Next: Greg Troxel
Message 1 of 2 in “Question concerning merge behavior”
  1. Defcon0Jul 26, 2012
  2. Greg TroxelJul 26, 2012

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.