All,
I recently moved (successfully) to Release 3.0. It was interesting but
did not have the better handling of reconciliation. So I moved back to a
backup copy of my L123 directory (successfully) only now if I do a 'git
pull' what I get is this message:
----------------
You asked me to pull without telling me which branch you
want to merge with, and 'branch.origin/master.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "origin/master"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
--------------
I can't find my brief note on re-setting git to the master branch. Can
someone post that or a link to a recipe? I'd like to stay on 2.8.x until
3.0 has all of Armaghan's improvements, then push everything at once,
unless that's not advised.
Thanks for all,
r
_______________________________________________
SQL-Ledger mailing list
[email protected]
http://lists.ledger123.com/mailman/listinfo/sql-ledger
