Dear All,
I think I made a mess with a recent push to the master repo for GT.
While working on this https://jira.codehaus.org/browse/GEOT-4236 I did
the following:
I created a local branch in our geotools repo (our as in the repo in
our github account) tracking upstream/master with
git checkout
given you already pushed to upstream you can't just go back in history
(like in git reset HEAD^1 --hard; git push) because others may have
already pulled those changes and would end up with mismatching
histories (and everybody forced to recover locally).
So I guess you just need o perform a
It seems that all that happened here was a merge commit that occurs when
you update from a remote repo and have local changes that haven't been
pushed. In this case it looks like your local branch was out of date by a
few days, hence the huge diff in that merge commit.
So no harm, but to avoid
