Re: git branches & merge

2016-10-13 Thread Kevin Daudt
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

Re: git branches & merge

2016-10-12 Thread Anatoly Borodin
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