On Wed, 7 Sep 2011, [email protected] wrote:
Commit: 5cde33977036ad00308dc14142cb0af46a5cc111 https://github.com/ledger123/ledger123/commit/5cde33977036ad00308dc14142cb0af46a5cc111 Author: Armaghan Saqib <[email protected]> Date: 2011-09-07 (Wed, 07 Sep 2011)Changed paths: M bin/mozilla/custom_am.pl Log Message: ----------- Added detail of orphaned rows and a DELETE query to delete these rows. modified: bin/mozilla/custom_am.pl
Just for giggles, I decided to try 'git pull' on this modification. Here's the response: [root@salmo /usr/local/sql-ledger]# git pull remote: Counting objects: 9, done. remote: Compressing objects: 100% (2/2), done. remote: Total 5 (delta 3), reused 5 (delta 3) Unpacking objects: 100% (5/5), done.
From git://github.com/ledger123/ledger123
a2e50df..5cde339 master -> origin/master Updating a2e50df..5cde339 error: Your local changes to 'bin/mozilla/custom_am.pl' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. How do I commit or stash changes? My copy of custom_am.pl is dated 2011-07-25 16:04 and contains 10247 bytes. Rich _______________________________________________ SQL-Ledger mailing list [email protected] http://lists.ledger123.com/mailman/listinfo/sql-ledger
