Hi Michael, I am not the git guru - so I am not sure if this works (I still do a old fashioned backup before doing git reorgs).
First, you should use "rebase" and not "merge" to incorporate the upstream changes. It keeps history more clean and makes some things much easier. If your local version of "develop" has no changes against the upstream develop, I guess the fastest would be: 1) move your local development branch away # git branch -m develop develop-old 2) Get a fresh copy from upstream git pull upstream/develop 3) Rebase your feature branch onto the fresh develop git rebase develop feature/sql_multiple_index_per_tablefeature Basically, git tries to apply the changes in your branch to the new develop source and rewrites the patches. I wrote the statements without a copy of the repo, so it might not work out of the box =) Oliver On 06.04.2012 21:36, Michael Bell wrote: > Hi, > > 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. > > Sorry for the trouble > > Michael > > P.S. next time I remove my old fork and create a fresh one. > > > > ------------------------------------------------------------------------------ > 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 -- Protect your environment - close windows and adopt a penguin! PGP-Key: 3B2C 8095 A7DF 8BB5 2CFF 8168 CAB7 B0DD 3985 1721 ------------------------------------------------------------------------------ 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
