in reply to [OT] complex GIT merging

OK, i wasn‘t a GIT user. But under SVN in similar situations I moved my stuff to a branch. Else pain in the ass.

Regards, Karl

«The Crux of the Biscuit is the Apostrophe»

perl -MCrypt::CBC -E 'say Crypt::CBC->new(-key=>'kgb',-cipher=>"Blowfish")->decrypt_hex($ENV{KARL});'Help