On Mon, Jul 25, 2011 at 10:38 PM, Br Nicholas Thirkettle OSB <[email protected]> wrote: > I have another problem. I can't git pull any longer. I get the following > message: > > error: Your local changes to 'sql-ledger.conf.default' would be overwritten > by merge. Aborting. > Please, commit your changes or stash them before you can merge. > > I don't recall making any changes to sql-ledger.conf.default.
Running the following should sort out this issue: > git checkout sql-ledger.conf.default and then > git pull should work. Regards Armaghan _______________________________________________ SQL-Ledger mailing list [email protected] http://lists.ledger123.com/mailman/listinfo/sql-ledger
