Skip to content
This repository was archived by the owner on Dec 22, 2023. It is now read-only.

Added 'FLAMES-game' folder to Scripts/Miscellaneous which implement the 'FLAMES' game using python script #54

Merged
merged 29 commits into from
Oct 1, 2020

Conversation

Saujanya0910
Copy link
Contributor

Description

Added a folder 'FLAMES-game' containing 'flames_game.py' script, 'README.md' having details and screenshots.

Fixes #(#33 )

Type of change

Choosing one or more options from the following as per the nature of your Pull request.

  • NOTE: These boxes can be checked using [X]

  • Bug fix (non-breaking change which fixes an issue)

  • New feature (non-breaking change which adds functionality)

  • Documentation Update

Checklist:

Please tick all the boxes that are fulfilled by your Pull Request.

  • I have named my files and folder, according to this project's guidelines.
  • My code follows the style guidelines of this project.
  • My Pull Request has a descriptive title. (not a vague title like Update index.md)
  • I have commented on my code, particularly in hard-to-understand areas.
  • I have created a helpful and easy to understand README.md, according to the given README_TEMPLATE.
  • I have included a requirements.txt file (if external libraries are required.)
  • My changes do not produce any warnings.
  • I have added a working sample/screenshot of the script.

@AdityaJ7 AdityaJ7 requested review from AdityaJ7 and chavarera October 1, 2020 03:06
@AdityaJ7 AdityaJ7 requested a review from tusharnankani October 1, 2020 03:11
@AdityaJ7
Copy link
Member

AdityaJ7 commented Oct 1, 2020

@Saujanya0910 Remove the extra files that you have committed your pull request must only contain what you have added!!
It must only contain 4 files

  1. your script
  2. your readme
    3 screenshot1
    4 screenshot2

Remove all other 16 files from commit

Copy link
Member

@AdityaJ7 AdityaJ7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unnecessary files

@Saujanya0910
Copy link
Contributor Author

These aren't my commit, these are from the pull upstream. The other commits are from before my commits.

@AdityaJ7
Copy link
Member

AdityaJ7 commented Oct 1, 2020

These aren't my commit, these are from the pull upstream. The other commits are from before my commits.

This happened because your fork was not up-to-date with our repo

before making changes in your forked repo please make sure it is up to date by running following commands:

  1. git remote add upstream https://github.com/Python-World/Python_and_the_Web.git
  2. git fetch upstream
  3. git pull upstream master
  4. git push

Thanks

@Saujanya0910
Copy link
Contributor Author

Before pushing my local repo to remote, I had updated my local repo as the upstream. What to do now ?

@AdityaJ7
Copy link
Member

AdityaJ7 commented Oct 1, 2020

Before pushing my local repo to remote, I had updated my local repo as the upstream. What to do now ?

I have fixed it now don't worry

@Saujanya0910
Copy link
Contributor Author

Thank you, and sorry for the inconvenience.

@AdityaJ7 AdityaJ7 removed the request for review from chavarera October 1, 2020 06:15
@AdityaJ7 AdityaJ7 merged commit 0bbc15c into Python-World:master Oct 1, 2020
@AdityaJ7
Copy link
Member

AdityaJ7 commented Oct 1, 2020

@all-contributors please add @Saujanya0910 for code

@allcontributors
Copy link
Contributor

@AdityaJ7

I've put up a pull request to add @Saujanya0910! 🎉

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants