Hi, the solution was a little bit more tricky:
1. Examine the situation: git checkout feature/sql_xxx git log 2. Revert wrong merge My mistake: I merged the upstream branch "develop" with the branches "develop" and "feature/sql_xxx" of the forked repository (2x merge). (Warning: check the output from git log to be sure that ~1 is correct) git reset --hard HEAD~1 3. Rebase (The first checkout only makes "develop" locally available.) git checkout develop git checkout feature/sql_xxx git rebase develop feature/sql_xxx This repairs my forked repository. The key was "git reset --hard" and Oliver's advice that git can automatically rebase to another branch. Thanks a lot Michael P.S. I'm still thinking about the indexes on workflow context values and certificate attribute values. -- ___________________________________________________________________ Michael Bell Humboldt-Universitaet zu Berlin Tel.: +49 (0)30-2093 70143 ZE Computer- und Medienservice Fax: +49 (0)30-2093 70135 Unter den Linden 6 [email protected] D-10099 Berlin ___________________________________________________________________ PGP Fingerprint: 09E4 3D29 4156 2774 0F2C C643 D8BD 1918 2030 5AAB
smime.p7s
Description: S/MIME Kryptografische Unterschrift
------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________ OpenXPKI-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openxpki-devel
