The International Simutrans Forum

 

Author Topic: Who has Github repositories for Simutrans-Extended?  (Read 339 times)

0 Members and 1 Guest are viewing this topic.

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19078
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Who has Github repositories for Simutrans-Extended?
« on: December 19, 2019, 01:03:11 AM »
I am in the process of trying to make sure that my subscriptions to people's Github repisotires is up to date so that I can pull code whenever people people push it. For the purposes of this thread, I am concerntrating on the core code rather than the pakset.
I so far have the following people who have pushed at least one update in the calendar year 2019:
  • Andrew Carlotti;
  • Phystam;
  • Ranran;
  • Ves;
  • W. Lindley; and
  • Casteroid.
Ought there be anyone else on this list?

Offline Freahk

  • *
  • Posts: 422
  • Languages: DE, EN
Re: Who has Github repositories for Simutrans-Extended?
« Reply #1 on: December 19, 2019, 08:52:15 AM »
Here, me!
But not much coding will happen soon.

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19078
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Who has Github repositories for Simutrans-Extended?
« Reply #2 on: December 19, 2019, 10:50:41 AM »
What is your repository's address, may I ask?

Offline Freahk

  • *
  • Posts: 422
  • Languages: DE, EN
Re: Who has Github repositories for Simutrans-Extended?
« Reply #3 on: December 19, 2019, 11:00:08 AM »
I did some tiny code change that you had incorporated manually and a few little commits to the pak yet.
https://github.com/irgend42

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19078
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Who has Github repositories for Simutrans-Extended?
« Reply #4 on: December 19, 2019, 11:39:34 AM »
I did some tiny code change that you had incorporated manually and a few little commits to the pak yet.
https://github.com/irgend42

Splendid, thank you.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2798
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Who has Github repositories for Simutrans-Extended?
« Reply #5 on: December 20, 2019, 11:09:09 AM »
I have also one, although long idle (vladki77).

Btw, what is the right way to get my repo / fork / branch up to date? 

I used to make pull requests from james's to mine, but then a pull from mine to james's would include all the duplicate commits since forking...

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19078
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Who has Github repositories for Simutrans-Extended?
« Reply #6 on: December 20, 2019, 12:29:04 PM »
I have also one, although long idle (vladki77).

Btw, what is the right way to get my repo / fork / branch up to date? 

I used to make pull requests from james's to mine, but then a pull from mine to james's would include all the duplicate commits since forking...

Best just to pull the master into your repository before pushing the result to Guthub.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2798
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Who has Github repositories for Simutrans-Extended?
« Reply #7 on: December 20, 2019, 01:07:58 PM »
Best just to pull the master into your repository before pushing the result to Guthub.

Maybe I'm too lame with git.
If I clone jamespetts/master at home computer, do some changes and pull again, it will tell me to stash away my changes.
Maybe more step-by step guide would be useful.

So far I did:
- forked jamespetts (long time ago)
- made some branches for the particular improvements I wanted to do (smokes, slopes)
- cloned my repo to home computer
- did development (git commit + git push)
- now my master and branches are many commits behind james
- how do I pull james/master if my working clone is vladki/something ?

Offline Rollmaterial fi

  • Devotee
  • *
  • Posts: 584
  • Languages: EN, FR, DE, FI, SE
Re: Who has Github repositories for Simutrans-Extended?
« Reply #8 on: December 20, 2019, 01:52:06 PM »
To pull you open the Git shell and run the git pull command.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2798
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Who has Github repositories for Simutrans-Extended?
« Reply #9 on: December 20, 2019, 02:39:00 PM »
If I clone jamespetts/master at home computer, do some changes and pull again, it will tell me to stash away my changes.
What is git shell? I use linux - git on command line. But as I said before: "If I clone jamespetts/master at home computer, do some changes and pull again, it will tell me to stash away my changes. " So How do I preserve my changes before pulling from master? How can I pull from james' repo and push to mine?

Please bear with me, when I learned programming there was nothing like git. And in the mean time I was an admin, not programmer.

Offline Rollmaterial fi

  • Devotee
  • *
  • Posts: 584
  • Languages: EN, FR, DE, FI, SE
Re: Who has Github repositories for Simutrans-Extended?
« Reply #10 on: December 20, 2019, 09:24:10 PM »
Then I guess you simply use git pull in the command line. The command should look like this:
Code: [Select]
git pull https://github.com/jamespetts/simutrans-extended master