On 09/09/12 10:59, Rolf Stöckli wrote:
You have merge conflicts in your files. You probably edited the files,
made a commit and your changes are not compatible with the code you
download from Github.
Can you explain in detail how you updated to branch "rel3"?
Regards
Rolf
_______________________________________________
SQL-Ledger mailing list
[email protected]
http://lists.ledger123.com/mailman/listinfo/sql-ledger
I copied, likely not verbatim, the following from an email to me/the
list from (I believe it was) Armaghan:
First, go to your ledger123 directory
Then:
git init
then:
git remote add origin git://github.com/ledger123/ledger123.git
git fetch
git branch --set-upstream master origin/master <------
From now on you can update your installation with
git pull
I changed the arrowed line to:
git branch --set-upstream master origin/rel3
and repeated the above steps. I monkeyed with several copies of my
backup but this is as I recall it. It's easy enough to re-download and
install the 22 March tarball, or to use my current install from backup,
but a lot of new things have gone in since and I'd like to have them.
It's also a case of me against git, and I'm not winning and I don't like
it. :)
Regards,
r
_______________________________________________
SQL-Ledger mailing list
[email protected]
http://lists.ledger123.com/mailman/listinfo/sql-ledger
