Hi Michael, > I wrote the code to add the missing indexes but I created the new branch > for this feature on another feature branch and not on develop. Is there > a chance to move the start of the new feature branch to the develop branch? > > feature/sql_multiple_index_per_table was created from > feature/server_dbi_explicit_sql_like_usage. You can visit the situation > at github. The fork bellmich/openxpki is public.
have a look at git rebase, it allows you to transplant entire subtrees to other places in your repo. You can then perform a forced update on your github repo (should be used sparingly and only if you are confident that nobody has pulled from you and started working on the old branch in the meantime). Alternatives include - isolating the commits in patches and manually applying them again (git format-patch and git am) - picking individual commits (git cherry-pick) BTW, http://shop.oreilly.com/product/9780596520137.do is an excellent documentation on Git and also covers such situations. It's also available as an ebook (even without DRM). cu Martin ------------------------------------------------------------------------------ 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
