Re: git-pull conflict - how to solve it?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 8 Feb 2008, Peter Teoh wrote:

... snip ...

> Tried before, but got errors as well....anyway...in doing all these
> stuff....my aim is shortest time possible .... and if going through
> all these errors and more errors expected in future....i rather
> restored back from backup.....the latter is done in
> 10minutes....Thank you for the support!!!

i can only imagine that, somehow, you corrupted your .git local
directory -- no other explanation makes sense.  and if that happens,
then the simplest solution is to, naturally, just blow the whole thing
away and restore it, either from backup or another long, tedious
checkout from the repository.

rday
--

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

Home page:                                         http://crashcourse.ca
Fedora Cookbook:    http://crashcourse.ca/wiki/index.php/Fedora_Cookbook
========================================================================

--
To unsubscribe from this list: send an email with
"unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx
Please read the FAQ at http://kernelnewbies.org/FAQ


[Index of Archives]     [Newbies FAQ]     [Linux Kernel Mentors]     [Linux Kernel Development]     [IETF Annouce]     [Git]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux SCSI]     [Linux ACPI]
  Powered by Linux