{"thread":{"id":"31105","subject":"Question concerning merge behavior","startedAt":"2012-07-26T11:30:34Z","lastAt":"2012-07-26T12:21:26Z","messageCount":2,"participants":["Defcon0","Greg Troxel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"195844","messageId":"1343302234333-7563780.post@n2.nabble.com","threadId":"31105","inReplyTo":null,"subject":"Question concerning merge behavior","fromName":"Defcon0","fromEmail":"patzer.dennis@googlemail.com","sentAt":"2012-07-26T11:30:34Z","receivedAt":"2012-07-26T11:30:34Z","isPatch":false,"sender":{"key":"patzer.dennis@googlemail.com","avatar":null},"body":"Hello,\n\nI'm quite new to git and have the following situation:\n\nI have a master- and a productive-branch. The productive-branch lives on a\nserver (productive environment) and the master is for the devs to play\naround ;-) Hot fixes and patches are primarily done in the productive\nbranch. New features are done in the master branch.\n\nNow the question is, let's say, I did a stability fix in the\nproductive-branch and want that one also in the master branch (which\ncontains several new features). Will I have conflicts then with files\nmodified in the master- but not in productive-branch? Or will only the\nmodified files from the productive branch be compared with the master branch\n(and not the modified ones in master)?\n\nAnd do you think my branching in all makes sense (master for features,\nbranch for production environment)?\n\nBig thanks in advance for any help!!\n\nBye Defcon0\n\n\n\n--\nView this message in context: http://git.661346.n2.nabble.com/Question-concerning-merge-behavior-tp7563780.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"195848","messageId":"rmiipdapvax.fsf@fnord.ir.bbn.com","threadId":"31105","inReplyTo":"1343302234333-7563780.post@n2.nabble.com","subject":"Re: Question concerning merge behavior","fromName":"Greg Troxel","fromEmail":"gdt@ir.bbn.com","sentAt":"2012-07-26T12:21:26Z","receivedAt":"2012-07-26T12:21:26Z","isPatch":false,"sender":{"key":"gdt@ir.bbn.com","avatar":null},"body":"\nI suggest that you read (all of)\n\n  http://www.git-scm.com/book\n\nand then perhaps ask a question based on more understanding of the merge\nmodel and ancestry tracking.   The short answer is that git will work\nquite well in terms of conflict management if your development practices\nare sane.\n\n\n\n"}]}