Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solution set 2 #43

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Solution set 2 #43

wants to merge 11 commits into from

Conversation

manan-garg1504
Copy link

Topic: Classes and objects

Question Set Name:2

Python Version Used:3.6.5

@ViRu-ThE-ViRuS
Copy link
Collaborator

@Manan1504 thanks for working on this man.
There just seem to be two issues:

  • U seem to be deleting some files u shouldn't be deleting
  • There are a LOT of commits for just adding 2 files

@paramkpr can u help my man out here....

@ViRu-ThE-ViRuS ViRu-ThE-ViRuS changed the title Solution set 2 WIP: Solution set 2 May 18, 2018
@manan-garg1504
Copy link
Author

manan-garg1504 commented May 18, 2018 via email

@paramkpr
Copy link
Collaborator

@Manan1504 You're deleting my soultion files as well. Update your fork. Do the following if you don't know what I mean;

  1. git remote add upstream https://github.com/Vector-Programming/VectorSessions.git
  2. git pull upstream master
  3. Then add, commit and push.

To reduce the number of commits you need to squash them. Google: "How to squash commits?"

If you have any other questions call me tommorow.

@ViRu-ThE-ViRuS
Copy link
Collaborator

ViRu-ThE-ViRuS commented May 19, 2018

@Manan1504 i suggest u copy ur code, reset ur repository with the latest version, and then paste the changes back. It will be easier than to rebase, recommit, solve merge conflicts etc.

@manan-garg1504 manan-garg1504 changed the title WIP: Solution set 2 Solution set 2 Jun 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants