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

Re: git branches & merge

From
Kevin Daudt <me@ikke.info>
Date
Oct 13, 2016, 15:49 UTC
Message-ID
<20161013154959.GB1698@ikke.info>
In-Reply-To
<CACNzp2nG1KfFuiSH1UUGVSz1T39PjzfDgCp6vqOVe7-Lph2yNw@mail.gmail.com>
On Wed, Oct 12, 2016 at 04:43:07PM +0200, Anatoly Borodin wrote:
Show 7 quoted lines
> Hi,
> 
> 
> 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.
Previous: Anatoly Borodin
Message 3 of 3 in “git branches & merge”
  1. webmaster@peter-speer.deOct 12, 2016
  2. Anatoly BorodinOct 12, 2016
  3. Kevin DaudtOct 13, 2016

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.