2012/1/4 Johan Compagner <jcompag...@gmail.com>: > What is then the nicest way? > Because must i then do a commit the local on 1.4 push that to the remote > then go to 1.5 and pull it, then merge the 1.4 changes to 1.5, commit that > (this could be slightly different because of some changes) > push that again to remote, > and then do that for trunk/master/1.6 all over again?
"You must unlearn what you have learned" - Yoda :) I find that the hardest thing with git is to remove the mental blocks inherited from subversion's centralized model. Just clone twice in /home/jc/wicket5 and /home/jc/wicket6, check out the correct branch in each, then setup 2 eclipse workspaces (one each). Then add remote references to be able to push/pull between the two. Then the process is what you describe, except you do not need to go to the remote origin, you can just move code between your 2 clones via push/pull, and then merge back and forth: for example while in /home/jc/wicket5, you do git pull local6 to bring in the changes in the 6 branch, you can then do the merge/cherry locally) When you are done, you can push to the remote origin. Renaud
