git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: webmaster@peter-speer.de
To: git <git@vger.kernel.org>
Subject: git branches & merge
Date: Wed, 12 Oct 2016 15:50:16 +0200 (CEST)	[thread overview]
Message-ID: <1240187899.41938.1476280216470.JavaMail.open-xchange@app08.ox.hosteurope.de> (raw)

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

             reply	other threads:[~2016-10-12 14:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-12 13:50 webmaster [this message]
2016-10-12 14:43 ` git branches & merge Anatoly Borodin
2016-10-13 15:49   ` Kevin Daudt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1240187899.41938.1476280216470.JavaMail.open-xchange@app08.ox.hosteurope.de \
    --to=webmaster@peter-speer.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).