melanierichards
commented
8 years ago @thadseaver I'm thinking it miiiight be because I squashed your earlier commits on my end, so despite the code being synced up Github still sees the history as being different? There is probably a fancy way to fix this but I'm afraid to tell you the wrong thing. So the easiest way to fix this might be to do the following after I merge your PR:
- Delete your fork
- Re-fork from the main repo
- Re-add the main repo as a remote (links I sent you in the other PR)
- From now on, create new feature branches (such that one new/complete task = one new branch) off of your master branch in order to make changes. That way if we ever need to squash commits again it'll be on a feature branch that can be deleted, instead of your master branch, which sticks around. I don't anticipate needing to squash much in the future, there were just a few weird commits hanging out on the first couple PRs.
This is kind of a pain so if you find some better way, that's fine, I just don't want to tell you the wrong thing and it be MORE of a pain.
thadseaver
@melanierichards I don't understand why all of the old commits show up in the pull request. Is this where squashing the commits (you mentioned earlier) should be used or do I have something jazzed up?