Thanks for this, I love how often these updates come out, BUT....
Whenever I try to pull from git hub all my changes get screwed up... deleted stations get put back in, changed services, etc.
When I first started to use TD I followed your (kfsone) setup instructions from the wiki and used Sourcetree but could never figure out how to use it properly and so I've just recently switched to cmd line GIT but I keep getting the same questions and problems from both.
First neither will report an update to the origin/master. git status says
Code:
git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: data/Station.csv
no changes added to commit (use "git add" and/or "git commit -a")
and Sourcetree indicates the same.
BUT, I know there is an updated version because kfsone says so, and it's listed right there in the wiki, so I go git pull anyway and get this
Code:
git pull
remote: Counting objects: 63, done.
remote: Compressing objects: 100% (63/63), done.
remote: Total 63 (delta 47), reused 0 (delta 0)
Unpacking objects: 100% (63/63), done.
From https://bitbucket.org/kfsone/tradedangerous
601f183..b9c6ef2 master -> origin/master
* [new tag] 6.14.2 -> 6.14.2
Updating 601f183..b9c6ef2
error: Your local changes to the following files would be overwritten by merge:
data/Station.csv
Please, commit your changes or stash them before you can merge.
Aborting
And again Sourcetree says the same things..
It's at about this stage I try git add and/or git commit or randomly right clicking on Sourcetree file lists, but I have no idea what I'm doing so I usually just give up...delete the whole TD repository and start again from scratch. I update every change I make to EDDB and Maddavo anyway so I don't actually lose the data. I get it back on the next maddavo import but it still a pain.
The point of the story.....
Can anyone give a set of simple steps/commands to use to prepare for and download/merge an update, without having to teach me git?