{"thread":{"id":"44289","subject":"git branches & merge","startedAt":"2016-10-12T14:08:24Z","lastAt":"2016-10-13T15:57:50Z","messageCount":3,"participants":["webmaster@peter-speer.de","Anatoly Borodin","Kevin Daudt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"303992","messageId":"1240187899.41938.1476280216470.JavaMail.open-xchange@app08.ox.hosteurope.de","threadId":"44289","inReplyTo":null,"subject":"git branches & merge","fromName":"","fromEmail":"webmaster@peter-speer.de","sentAt":"2016-10-12T13:50:16Z","receivedAt":"2016-10-12T14:08:24Z","isPatch":false,"sender":{"key":"webmaster@peter-speer.de","avatar":null},"body":"Hi.\nI have created a release_x branch to work on a new release. The branch is based\non master.\nLater I needed to create a hotfix_x branch to work on a hotfix. This branch is\nalso based on master.\n\nIn the hotfix_x branch I needed to correct an IP address to communicate with.\nAfter doing so, I merged the hotfix_x branch with master again and made my\ndeployment.\n\nNow in the release_x branche the IP address is still the old one.\nI am afraid of committing and merging my release_x branch since I think that my\nnewly defined IP address (now on master) will be overridden when merging.\nAm I right? If yes, what is the best way to solve this?\n\nThanks\n-fuz\n"},{"id":"303995","messageId":"CACNzp2nG1KfFuiSH1UUGVSz1T39PjzfDgCp6vqOVe7-Lph2yNw@mail.gmail.com","threadId":"44289","inReplyTo":"1240187899.41938.1476280216470.JavaMail.open-xchange@app08.ox.hosteurope.de","subject":"Re: git branches & merge","fromName":"Anatoly Borodin","fromEmail":"anatoly.borodin@gmail.com","sentAt":"2016-10-12T14:43:07Z","receivedAt":"2016-10-12T14:43:54Z","isPatch":false,"sender":{"key":"anatoly.borodin@gmail.com","avatar":"https://gravatar.com/avatar/59f11f1f45cf5ebb7bcca8da94b43cfe5f596d91c0a3e27ad0d2a861cc2bbce7?d=mp&s=160"},"body":"Hi,\n\n\nthe IP will not be overwritten, you'll still have the new IP in\nmaster. Nothing to worry about :)\n\n\n-- \nMit freundlichen Grüßen,\nAnatoly Borodin\n"},{"id":"304080","messageId":"20161013154959.GB1698@ikke.info","threadId":"44289","inReplyTo":"CACNzp2nG1KfFuiSH1UUGVSz1T39PjzfDgCp6vqOVe7-Lph2yNw@mail.gmail.com","subject":"Re: git branches & merge","fromName":"Kevin Daudt","fromEmail":"me@ikke.info","sentAt":"2016-10-13T15:49:59Z","receivedAt":"2016-10-13T15:57:50Z","isPatch":false,"sender":{"key":"me@ikke.info","avatar":"https://avatars.githubusercontent.com/u/135698?v=4"},"body":"On Wed, Oct 12, 2016 at 04:43:07PM +0200, Anatoly Borodin wrote:\n> Hi,\n> \n> \n> the IP will not be overwritten, you'll still have the new IP in\n> master. Nothing to worry about :)\n> \n> \n\nTo expand on that, git does a so called 3-way merge. This means git will\nlook for a common base commit, and compare changes from both sides to\nsee which side actually made a change.\n\nIn your case, the base and the release branch both should show the old\nip, and the master side would show the new IP. This tells git that\nmaster has changed, and not the release branch, and takes the master\nside of the change, resulting the new IP to show up.\n\nHope this helps, Kevin.\n"}]}