Hi guys,
I need some help with Git. I made some changes to the gmap3-project on
the master branch which I wanted to cherry-pick to the wicket-6.x
branch. While the project resides in the "jdk-1.7-parent" folder on the
master branch, it's located in the "jdk-1.6-parent" folder when I'm on
the wicket-6.x branch, thus Git does not let me cherry pick my changes.
Could someone please tell me how to cherry-pick the changes I made
without starting copy/pasting between the branches? How is this done
properly?
PS: @Martin Grigorov: you cherry-picked another change of mine a few
months ago into the wicket-6.x branch
(https://github.com/wicketstuff/core/commit/ee39d84a39240362e29d9dda6819877e2d398fa3)
where you seem to had the same trouble :-) At least the changes in the
wicket-6.x branch are in the "jdk-1.7-parent" folder (e.g.
https://github.com/wicketstuff/core/tree/wicket-6.x/jdk-1.7-parent/gmap3-parent/gmap3-examples/src/main/java/org/wicketstuff/examples/gmap/rectangles)
and not in the "jdk-1.6-parent" (e.g.
https://github.com/wicketstuff/core/tree/wicket-6.x/jdk-1.6-parent/gmap3-parent/gmap3-examples/src/main/java/org/wicketstuff/examples/gmap)
folder where they belong to.
- [wicketstuff] Need help with cherry-picking Joachim Rohde
-