On Wed, Oct 12, 2016 at 04:43:07PM +0200, Anatoly Borodin wrote:
> the IP will not be overwritten, you'll still have the new IP in
> master. Nothing to worry about :)
To expand on that, git does a so called 3-way merge. This means git will
look for a common base commit, and compare changes from both sides to
see which side actually made a change.
In your case, the base and the release branch both should show the old
ip, and the master side would show the new IP. This tells git that
master has changed, and not the release branch, and takes the master
side of the change, resulting the new IP to show up.
Hope this helps, Kevin.