Re: mapi32: Add Gaelic resource (try4)

[Ken Sharp]

On 7/7/2010 10:34 AM, GOUJON Alexandre wrote:
> On 07/06/2010 11:51 PM, Michael Stefaniuc wrote:
> > Did you test it with a fresh branch? You don't even need a named
> > branch for that; one with the detached HEAD works as well for the test:
> > - git checkout origin/master
> > - git am $email
>
> I'm not an expert but here is what I do in these cases:
> git reset --hard origin #remove any change
> git status #to see if you have a clean directory, if not rm or mv all
> you want
> git pull #update
> git apply /path/to/your.patch
>
> You should also have a look at http://wiki.winehq.org/GitWine (^D it,
> very useful)

I usually just use
git fetch ; git rebase origin
Followed by
patch -p1 < foo.patch

Never had any problems until recently.