jacksonbates / fcc-git-nomic

A Nomic game designed to teach new developers git and Github workflows for open source contributions.

See more at my site: Jackson Bates.

fcc-git-nomic's Issues

Does removing a file in a branch removes it from the master branch even before merging the two branches?

Sorry,
I've another question.
After I forked this repo and cloned it on my local machine then made the new_ruleset branch out of the master branch.
I wanted to modify the new_ruleset branch by deleting the old RULES.md file.
I already deleted it from the branch and committed the changes to the branch but not to the master branch.
And also I didn't merge the branch with master yet.
But the file is deleted from the master branch, could anyone tell me why ?
As when I checkout to the master branch and do ls -la command , I don't find the file.
What if I want to delete the branch and discard the changes made to it ?
And what if I want to delete a file from a branch but not from the master branch what commands should I use?

A little inquiry

Hey,
I'm new with you here, I think this game is a good idea and I want to share playing with you.
I have an enquiry,
It says here,

without losing your local changes.

This means,
If I had committed changes to my local repo before merging, it wouldn't be lost after merging the new update of the original repo ?.
And if so, it will keep my changes and add to them the new update ?.
And what if they conflict to each other like I'm editing a specific rule while in the new update this rule doesn't exit ?.

Minor whitespace issues in RULES.md

There is a minor whitespace issues on Rule 5.
If a rule is accepted,the player that proposed...
There should have a space after accepted

General Discussion thread

Since this platform does not have an easy way of conducting informal conversations outside of commenting on PRs, this issue can be used for miscellaneous comments between players.

Add "How to vote" file

I am new to the game and in order to create a pull request I had to vote for open pull requests first. It took some time until I figured it out how to vote. There is probably going to be a new way of voting (with +1), so I thought it would be a good idea to create new file "How to vote". The new file would include explanations and a couple of screenshots like this..

If you don't like the idea of adding new file than something similar can be added to wiki. Please let me know what you think.

Only new rules?

Dear fellow players,

By reading RULES.md, I understand that pull requests can be used to propose new rules. What about amendments to existing rules? This does not seem to be an option.

For instance, I'd like to propose to amend rule 4, which currently forbids a player from proposing more than one rule at a time. Indeed, players are not allowed to propose a new rule if there is an outstanding proposal they have not personally cast a vote on; but according to rule 3, players cannot cast a vote on their own proposals. Hence a player who proposed a new rule must wait until it is accepted or rejected before they can propose anything else.

But I cannot propose to amend rule 4, because the rules only explains how to propose new rules. Rule 7 briefly mentions rule-changes but does not explain how to propose one.

Market Place

In this thread you can @ mention any player that you wish to trade with.

Current trading accounted for in the rules (as at 22 Nov, 2018) is to trade 1 Sticker with anyone with the title Hunter Of Bugs in order to have one Bug removed.

Any other trades allowed (or not explicitly disallowed) by the rules can be conducted here.

Delete Local and Remote Branch After the PR is Accepted or Closed, not Before

After opening a pull request, the next step in CONTRIBUTING.md leads the player to potentially delete their branch too soon:

Now you can delete your local and remote branches:

It's possible more work will need to be done on that branch and deleting it might cause problems with this process.

Language should be added that reminds the player to not delete the local and remote branches until the PR has either been accepted or closed.