Skip to content

adding assignment 5 - Riva#81

Open
rivaf wants to merge 2 commits intobnajafi:masterfrom
rivaf:master
Open

adding assignment 5 - Riva#81
rivaf wants to merge 2 commits intobnajafi:masterfrom
rivaf:master

Conversation

@rivaf
Copy link

@rivaf rivaf commented Oct 24, 2017

No description provided.

@bnajafi
Copy link
Owner

bnajafi commented Oct 29, 2017

There is a conflict in your submission, most possibly because of a hidden file, because of which I can not merge it and it can not be resolved through git hub. My suggestion to evade wasting your time, is that you preserve your assignment folders in a separate place on your hard disk first. Then go to your fork of GITHUB and delete the repository of Scientific_Python_Assignments_POLIMI_EETBS, that you had froked from your folder( To do so, you need to go to settings tab, go to the bottom of the page, choose delete repository and it will ask you to type the name of the repo and it will remove it) Then go to my profile, fork the repository again, clone in another folder in your PC, add you files, then add commit and push, and at the end create a pull request.

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.

2 participants