V1.2.x

[mwidner]

This is a fix for issue #466

[tilgovi]

@mwidner thanks! Could you remove the build files from the PR, please?

[tilgovi]

@mwidner did you mean to close this?

[mwidner]

More: I'm trying to figure out how to get rid of those extra commits for the pull request. :P

[tilgovi]

Oh, heh.

In this case, since those files are never committed, it should be enough to git rm them. In other scenarios, where you don't want to remove the file but just not change it in this commit, it's trickier.

After you've removed them, you can git commit --amend to amend the last commit.

Once you've done that, you can force push over the branch and it will update the pull request. Force pushing isn't a great thing to do if you have public collaborators or a branch, but if the LacunaStories:v1.2.x branch is just something you have for this PR, it's acceptable.

Not having to worry about rewriting history that other people may have forked and built from is one reason why making a small branch per pull request is often a good idea. That way you have a scratch space that is completely yours. So, in other words, making a PR from a branch called LacunaStories:466-overlap-fix to openannotation:v1.2.x means that you don't have to worry about LacunaStories:v1.2.x deviating from openannotation:v1.2.x.

The flow can be from feature branch (you) to upstream (here) back to downstream (you).

Hope that helps rather than confuses. I'm happy to point you to things if you need some reading.

[mwidner]

Closing this one because sending a different pull request without all the junk in it... Thanks for the tips.