Am 07.09.2011 23:47, schrieb Rich Shepard:
[root@salmo /usr/local/sql-ledger]# git checkout bin/mozilla/custom_am.pl
error: pathspec 'bin/mozilla/custom_am.pl' did not match any file(s) known
to git.
Type
git status
If you get a list of files "modified... both modified..." you are still
in the middle of the merge command. In this case I would just replace
the file "bin/mozilla/custom_am.pl" with the one from Github. Then check
if the file ".gitignore" is present. If not, copy this one too. After
that, you can type
git add .
git commit -m"Merge with Github"
Maybe you get a warning because of a missing e-mail address, but this is
not important.
If this succeeds, you can type
git pull
again and you should get an "already up to date" message.
Regards
Rolf
_______________________________________________
SQL-Ledger mailing list
[email protected]
http://lists.ledger123.com/mailman/listinfo/sql-ledger
