On Thu, 8 Sep 2011, Rolf Stöckli wrote:
Type
git status
If you get a list of files "modified... both modified..."
Nope. None of those.
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
It wants the e-mail address and name, then
git pull
[root@salmo /usr/local/sql-ledger]# git pull
*** Please tell me who you are.
Run
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident <[email protected]> not allowed
I have to run git as root because users don't have write access to
/usr/local/.
Rich
_______________________________________________
SQL-Ledger mailing list
[email protected]
http://lists.ledger123.com/mailman/listinfo/sql-ledger
