Re: [Banshee-List] building on Windows

[sirblackheart <sirblackheart lagoc org>]

Chris Howie wrote:
> 
> On Mon, Jul 6, 2009 at 5:02 AM, Fergal <fergal moran wasptech com> wrote:
>> Great article Gabriel, thanks.
>> When I run git pull in the /banshee directory though I get
>>
>> Updating 80c83bc..9270fc6
>> error: Entry 'po/he.po' not uptodate. Cannot merge.
>>
>> I'm afraid I'm not too familiar with git, so I've no idea how to get
>> around
>> this.
>> git pull works fine in the /banshee/bin directory though.
> 
> This means that the named file has been changed in your local copy,
> but has not been committed locally.  In other words, your working copy
> is dirty.
> 
> "git reset --hard" will revert all changes to your working copy.  Then
> you should be able to "git pull" successfully.
> 
> -- 
> Chris Howie
> http://www.chrishowie.com
> http://en.wikipedia.org/wiki/User:Crazycomputers
> _______________________________________________
> banshee-list mailing list
> banshee-list gnome org
> http://mail.gnome.org/mailman/listinfo/banshee-list
> 
> 

Even after using git reset --hard, git pull "error: Entry 'autogen.sh' not
uptodate. Cannot merge.
-- 
View this message in context: http://old.nabble.com/building-on-Windows-tp24315098p26826103.html
Sent from the Banshee mailing list archive at Nabble.com.