On Wed, Oct 12, 2016 at 04:43:07PM +0200, Anatoly Borodin wrote:
> 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 compa
Hi,
the IP will not be overwritten, you'll still have the new IP in
master. Nothing to worry about :)
--
Mit freundlichen Grüßen,
Anatoly Borodin
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
3 matches
Mail list logo
