[Libreoffice] Question about Git
serval2412 at yahoo.fr
Thu Nov 4 16:09:10 PDT 2010
I've made changes on my repository and now when i type :
bin/g pull -r
i've got :
extensions/source/activex/main/SOActionsApproval.cpp: needs update
extensions/source/activex/main/SOComWindowPeer.cpp: needs update
extensions/source/activex/main/SODispatchInterceptor.cpp: needs update
refusing to pull with rebase: your working tree is not up-to-date
I'd like not to commit, to retrieve directly the last versions from the
I tried git pull --rebase
and i got this :
remote: Counting objects: 45, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 22 (delta 19), reused 0 (delta 0)
Unpacking objects: 100% (22/22), done.
d4aebb9..64b35a3 libreoffice-3-3 -> origin/libreoffice-3-3
896a77b..1a69901 master -> origin/master
First, rewinding head to replay your work on top of it...
Fast-forwarded master to 1a69901f7e888719f034812838f7841ac86cdfa3.
then the same again and i got :
Current branch master is up to date.
then i try this (found on this url
-> No local changes to save
git pull --rebase
-> Current branch master is up to date.
git stash pop
-> Nothing to apply
It must be quite simple but i don't know git at all.
In advance, thanks for your help
More information about the LibreOffice