[Piuparts-devel] welcome buster!

[Holger Levsen]

On Mon, Jun 26, 2017 at 01:06:36AM +0200, Andreas Beckmann wrote:
> do it *before* doing any other changes to develop

well, that's too late now…

> > 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

$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
nothing to commit, working tree clean
$ git cherry-pick -s 648d536f0
error: commit 648d536f01c05d0ccf0c75b02885fe016d171767 is a merge but no -m option was given.
fatal: cherry-pick failed
debian-work:~/Projects/piuparts/git/piuparts$ 



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/20170626/718b7ae0/attachment.sig>