rum2mojito / Travian-bot

Travian-bot for Travian auto building, training...
Mozilla Public License 2.0
0 stars 2 forks source link

update resource db #3

Open rum2mojito opened 6 years ago

rum2mojito commented 6 years ago

@mmoriaaa

rum2mojito commented 6 years ago

like this https://t4.answers.travian.com/index.php?view=answers&action=answer&cid=224 change cid=???

rum2mojito commented 6 years ago

@mmoriaaa

Add the remote, call it "upstream":

git remote add upstream https://github.com/rum2mojito/Travian-bot.git

Fetch all the branches of that remote into remote-tracking branches,

such as upstream/master:

git fetch upstream

Make sure that you're on your master branch:

git checkout master

Rewrite your master branch so that any commits of yours that

aren't already in upstream/master are replayed on top of that

other branch:

git rebase upstream/master

rum2mojito commented 6 years ago

https://www.youtube.com/watch?v=phHM6glUURw&t=1219s