[Piuparts-devel] welcome buster!

[Andreas Beckmann]

On 2017-06-22 15:46, 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?

do it *before* doing any other changes to develop

with develop == 648d536f0^ this would have been

git merge --ff-only 648d536f0

> If I just do "git merge master" on develop, I immediatly get conflicts
> upon merging the first commit…

yes, these need to be resolved manually, which I did in 648d536f0


Andreas