search

mikeizbicki / ucr-cs100

open source software construction course
Other
486 stars 407 forks source link

Trying to Rebase #1787

Closed laurenB93 closed 9 years ago

laurenB93 commented 9 years ago

I am getting some issues when rebasing. My forked repo said it was only 29 commits behind and I was trying to squash the commits. When I rebased them, more than 29 came up, it was more like 50. So i squashed all the commits from the project to the first one from the project but it added other people's commits to it too. Now it says I am 23 commits behind and I don't know what happened. Now I don't know how to fix this issue.

ghost commented 9 years ago

Dont forget to fetch updates from the repo.

laurenB93 commented 9 years ago

Thank you! I figured it out.