Joris Huizer wrote: > git fetch; git rebase origin Have you committed all updates before you git rebase origin? git commit -a -m "all"; git rebase origin; git reset HEAD^ Jeff Latimer