John Ralls <[email protected]> writes:
> Umm, gnucash-docs is a different repository. If gnucash won't pull,
> it, rather than gnucash-docs, should be what fails.
Yeah, it's the "gnucash" repo, not "gnucash-docs", that was failing.
Sorry for the confusion.
> The problem in gnucash is likely the line-ending problem which is
> thankfully largely eliminated with the removal of packaging/win32. Try
> running `git rm -r packaging/win32` and then pulling.
I just changed it to fetch and then reset, which should work better than
the pull. I should never need to merge these trees.
> Regards,
> John Ralls
-derek
--
Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
Member, MIT Student Information Processing Board (SIPB)
URL: http://web.mit.edu/warlord/ PP-ASEL-IA N1NWH
[email protected] PGP key available
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
