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

git branches & merge

From
Wwebmaster@peter-speer.de <webmaster@peter-speer.de>
Date
Oct 12, 2016, 13:50 UTC
Message-ID
<1240187899.41938.1476280216470.JavaMail.open-xchange@app08.ox.hosteurope.de>

Hi. I have created a release_x branch to work on a new release. The branch is based on master. Later I needed to create a hotfix_x branch to work on a hotfix. This branch is also based on master.

In the hotfix_x branch I needed to correct an IP address to communicate with. After doing so, I merged the hotfix_x branch with master again and made my deployment.

Now in the release_x branche the IP address is still the old one. I am afraid of committing and merging my release_x branch since I think that my newly defined IP address (now on master) will be overridden when merging. Am I right? If yes, what is the best way to solve this?

Thanks -fuz

Next: Anatoly Borodin
Message 1 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.