[Libreoffice] Git pull problems

[Alex Thurgood]

Le 14/12/2011 10:47, Michael Meeks a écrit :

Hi Michael,

>
> 	So - this could happen in quite a few ways; most probably if you
> committed something locally, then used git format-patch -1  to send it
> off - and then someone else tweaked your patch before applying.
>
> 	I tend to use ./g pull -r # for rebase - that would perhaps try to
> re-base your work on top of master&  might unwind the conflict for you.
>
> 	Failing that; winding back your master can help:
>
> 	git tag -f here # backup tag in case we loose something
> 	git reset --hard HEAD~50
> 	git pull -r
>
> 	That winds back 50 commits and then re-pulls; of course if you have any
> commits of your own, you'll now need to do 'gitk here' and cherry pick
> them across.
>


Thanks, will try it out. I'm not too worried about any local commits I 
might have made, they were minor edits to Base help files, and I can 
always do them again.


Alex