[Cryptech Tech] git-fu with merge and signed commits

[Joachim Strömbergson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Aloha!

Rob Austein wrote:
> No clue, then.  Did you commit anything after the merge?

Yes, I did a normal signed commit after merge and then tried to push the
whole shebang.

I 'solved' the problem by simply cloning the repo again.

- -- 
Med vänlig hälsning, Yours

Joachim Strömbergson - Alltid i harmonisk svängning.
========================================================================
 Joachim Strömbergson          Secworks AB          joachim at secworks.se
========================================================================
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJU1FvqAAoJEF3cfFQkIuyNJyIP/RB+TYBFu5hqgoXQ03skrJgf
NHnR2mU6KHR0qLKQAR7kfsL51e9BegGlgwOAE2xMs8xXE27INbcaAXIKjqjQWdr8
VJ1jx11uV/0CGuHb3B3JAFxwPsxCXQjurhFALiEc5ledTwBxBoj0ENojmP7L/rg7
M/GgTIbZ2jXYDY3GsoBJOFJPOOda8vAX0Owe8rW/MYbyPIlmTWk0NgPlY0RL7drv
xCdJ9hS+bOfJeGNPtR8HcGm3MU8glsuckN3RoCGfDQFYAIeozhSs3dYni4bylwjo
Ieb3XhsEazIaw+iHQllpmS1vZB1i2AxiicjY9m7RqB+6hM+VueFPIzKyvi8VhHjD
EUg/wlLdNG7tr8wf9LhmuXWjzn73R74on9SiXynku0zNEZ4MZMckAynRyZtD/1gu
pl+Y70wZCPCdLyx+p8VzLNMClH6AKDIxF8qc1BFVuy/NaGeBGv8H5N81uvDrxiKB
Nyx0NF7N3ZsXE7mV80RXTcQ/KqzClpL2Z/ytQTxNFlnjcdNaRsoTL69VQevvVQd5
IcIUdVhIEneJPA0cWmdku0Fk4zn9cHmloaUcUTcmSQYzfFKli017cbPC7N2Y68su
aMkKRQd5HQAAM/OGyWJjV6PAwAcKQ/1PO/BqAPEAFwVd1pFzWpEQkHNSVBhGFMcf
LO993pMFaBiQ+f0oWKkz
=MufH
-----END PGP SIGNATURE-----