search

CSC495-2014 / TeamworkEnglewoodGit

GNU General Public License v2.0
5 stars 15 forks source link

added RoutesTest.php #164

Closed cdwainscott closed 10 years ago

cdwainscott commented 10 years ago

so i am trying to just commit my RoutesTest.php file only but my request said 61 files changed...

I hope i did this right. please let me know what i did wrong if i did.

sorry

mboie commented 10 years ago

It says you have 61 files changed because you made two commits back in January that were never part of a pull request. So now that you are trying to commit your route test file, it wants to commit all those previous changes/additions/etc. as well.

I am not sure if those old updates were part of the project and are just out-dated or what but I think you are going to want to find a way to take that out of the pull request. Either by reverting your branches back to a previous state with git checkout or doing something along those lines.

Unfortunately, I do not know if it is an easy fix. Perhaps doing a git add with your whole directory would get your repository back on track (if you have an updated local copy). But I am not entirely sure. That could make the problem worse. So I would proceed with caution.

Anyone else ever run into a similar issue? It is kind of hard to make suggestions when it is not something you experienced directly.

kwpembrook commented 10 years ago

You can get rid of unwanted files in the commit by using this command for each file 

git checkout 4851e24 -- public/js/mainTabbedInterface.js

with the "4851e24" being the commit hash and then the file path of the file to be removed from the request after the --

mikeholler commented 10 years ago

The commit hash should be the hash of the most recent commit on upstream.

mikeholler commented 10 years ago

Easiest way to fix this would just be to clone anew and then copy-paste only the changes you made in your commit into the appropriate files, then add, commit, and push.

cdwainscott commented 10 years ago

well ive been trying to fix it to just commit one file but dont think im getting anywhere. I have to go study for my final tonite so i cant work on this anymore. send me a update when u get to this @apotheos and ill see if we can work it out

cdwainscott commented 10 years ago

That is what I did originally and that is how this happened. I don't know how to get rid of the changes that are already pushed up to my repository on gihub. I even went to St Clair for help and she just told me to commit what I had.

mikeholler commented 10 years ago

@cdwainscott, just send me the file and I can throw it in if everything's good with it.

mikeholler commented 10 years ago

Nevermind, I can merge it myself. I see it in this PR.

mikeholler commented 10 years ago

See #169.