Author Topic: Using Git and Github to contribute  (Read 15118 times)

Offline infectedmochi

  • Survivor
  • ***
  • Posts: 664
  • Omnomnom!
    • View Profile
Re: Using Git and Github to contribute
« Reply #15 on: December 24, 2013, 09:29:40 PM »
I'm not sure if it's just me, but
Code: [Select]
git push -u origin some-new-branch  does not work for me, trying to push commits will result in a 403 error. Apparently 'origin' is set to the same as upstream by default, in this case it's CleverRaven/Cataclysm-DDA.git . I had to change it to my own repo using
Code: [Select]
git remote set-url origin https://github.com/infectedmochi/Cataclysm-DDA.git And it works fine again.

Edit: And I can't replicate this :/ Maybe it was a screw-up on my part after all.
« Last Edit: January 23, 2014, 09:32:15 AM by infectedmochi »

Offline Wuzzy

  • Survivor
  • ***
  • Posts: 276
    • View Profile
Re: Using Git and Github to contribute
« Reply #16 on: March 30, 2014, 06:36:19 PM »
You wrote this:
If you're just modding data files: possibly not, because
The rest of this sentence somehow got lost. Could you please complete it?

PS: Thank you for this guide. It really helps!

Offline i2amroy

  • Contributor
  • Survivor
  • ****
  • Posts: 2756
  • Cats, ruling the world one dwarf at a time
    • View Profile
Re: Using Git and Github to contribute
« Reply #17 on: March 31, 2014, 08:55:30 AM »
Soron has been gone for almost a year now. That said that last section should really be changed to:
"Yes, you need to use git. The community is busy enough that it's a requirement. We'll be happy to help you setup and learn to use git, but it's a definite requirement if you want to get anything merged into the mainline".

Offline Zhilkin

  • NPC
  • **
  • Posts: 110
    • View Profile
Re: Using Git and Github to contribute
« Reply #18 on: February 16, 2017, 09:30:12 PM »
Is it okay that my forked repository is X commits behind original repository after I did git pull --ff-only upstream master and local master is now equal to upstream/master?