search

Ygoproco / Live

Instant update files for Ygopro Percy
https://www.ygopro.co
6 stars 14 forks source link

Questions with Commits, Pull Requests and how it'll show up in YGoPro's Update Log #172

Open MichaelLawrenceDee opened 8 years ago

MichaelLawrenceDee commented 8 years ago

So I have first made a commit: cybercatman's fix for Action Duels. I made a Pull Request then. Afterwards, I made another commit to add Eerie Code's Ancient Gear Chaos Fusion. However this time, I cannot make another pull request. If it gets merged, how will this show up in game? A single description or 2? Like:

Added "Ancient Gear Chaos Fusion", credits to Eerie Code by Michael Lawrence Dee

Action Duel fix by cybercatman by Michael Lawrence Dee

Or will the 2nd one not be viewed? Like simply:

Action Duel fix by cybercatman by Michael Lawrence Dee

mercury233 commented 8 years ago

Your pull request says

MichaelLawrenceDee wants to merge 2 commits into Ygoproco:master from MichaelLawrenceDee:master

So, when the admin do this merge, he will pull from MichaelLawrenceDee:master at the current status(Added "Ancient Gear Chaos Fusion" and Action Duel fixed).

So the answer of your question is the former.

What is more, it is advised to use branch to make pull request, to avoid this situation.

MichaelLawrenceDee commented 8 years ago

I have used Github several times but I never mastered it. Thanks for the suggestion.