On Mon, May 12, 2014 at 1:42 PM, Philip Oakley <philipoak...@iee.org> wrote:

>> tabdulradi@radian-XPS:~/workspace/myproject$ git pull --rebase
>> remote: Counting objects: 66, done.
>> remote: Compressing objects: 100% (60/60), done.
>> remote: Total 66 (delta 4), reused 25 (delta 0)
>> Unpacking objects: 100% (66/66), done.
>> From github.com:CompanyAccount/myproject
>>  + 87f93aa...629fe47 master     -> origin/master  (forced update)
>
> This "forced update" suggests you have your refspecs configured to do an
> overwrite on the fetch stage, so you would loose you own local commits if
> they aren't on a separate branch.

That's not true. His local commits are in "master", not
"origin/master". All systems have configured forced updates for remote
tracking branches. It's normal for "origin/master" to be overridden.

-- 
Felipe Contreras

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to