----- Original Message ----- From: "Robert Park" <[email protected]> To: "Allan E. Registos" <[email protected]> Cc: "gnome-shell-list" <[email protected]> Sent: Wednesday, January 12, 2011 10:27:34 AM Subject: Re: jhbuild error
On Tue, Jan 11, 2011 at 4:33 PM, Allan E. Registos ><[email protected]> wrote: >> CONFLICT (content): Merge conflict in po/eu.po >Every now and then I'll see a merge conflict in some package or other. >It makes no sense to me because I'm not actually developing any of >these packages, so I don't understand why a pristine source tree would >have a merge conflict with itself, but invariably I can just choose >option 6, "wipe directory and start over", and after that it's able to >check out and build successfully. I understand, starting over would be the quickest fix, but its not an option for those with slow connections. Anyway, option 6 is worth to try. -- http://exolucere.ca
_______________________________________________ gnome-shell-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/gnome-shell-list
