On 28.10.08 01:18:18, Robert Richter wrote: > That you did is as expected. Do this: > > git fetch origin # updates the remote repository > git checkout -b perfmon3 origin/perfmon3 # creates a new branch from perfmon3
To update your existing perfmon3 branch you could do: If you have no local commits: git fetch origin git checkout perfmon3 git reset --hard origin/perfmon3 or: git fetch origin perfmon3:perfmon3 With local changes you have to rebase or merge. If you plan to submit your patches you have to use rebase: git rebase origin/perfmon3 perfmon3 or git checkout perfmon3 git merge origin/perfmon3 In both cases this may result in merge conflicts. You can see them with git diff or git status. Edit the changes not yet in the index, add them with git add, then run git rebase --continue or if you do a merge git commit. -Robert -- Advanced Micro Devices, Inc. Operating System Research Center email: [EMAIL PROTECTED] ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ perfmon2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/perfmon2-devel
