[Piuparts-devel] welcome buster!

[Holger Levsen]

On Thu, Jun 22, 2017 at 01:46:05PM +0000, Holger Levsen wrote:
> On Sun, Jun 18, 2017 at 04:24:52PM +0200, Andreas Beckmann wrote:
> > 648d536f0 Merge branch 'master' into develop
> [...]
> > the merge commit is best fast-forward merged, not cherry-picked
> 
> any hint how to do that best?
> 
> If I just do "git merge master" on develop, I immediatly get conflicts
> upon merging the first commit…

git merge -X theirs master

did the trick nicely.


-- 
cheers,
	Holger
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/piuparts-devel/attachments/20170622/99b8ef74/attachment.sig>