search

wmcnicho / QCP_SP2015

A quantum computing emulator made by undergraduates at University of Edinburgh
0 stars 0 forks source link

Problems with git #6

Closed cm66 closed 9 years ago

cm66 commented 9 years ago

Hey everyone!

I'd like to upload my latest version of the Sparsematrix-Class, but git won't let me... when I "pull", there's a file-conflict and when i "push" or do anything else, it rejects everything saying "first pull"

What shall I do?

cm66 commented 9 years ago

Hey! I put 2 files on Dropbox, probably somebody has time and skills to upload it to our project? Thanks!

wmcnicho commented 9 years ago

For future reference I believe that the issue you were having was that you pulled before pushing (as you should) but there were new files on the remote repository. To fix this simply commit your code again unless there are conflicts (then fix them first and then commit).