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 counter-patch and revert the unwanted commit(s). (git revert -n <commit>; git revert -n <commit 2>; git commit -m "back to good state") Then, before ever pushing to master, remember to first do git pull --rebase upstream/master. Or maybe there's a way to fix it that I don't know of. Hope that helps though. Cheers, Gabriel On Tue, Aug 21, 2012 at 7:25 AM, Simone Giannecchini <[email protected]> wrote: > 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 -b upstream_master upstream/master > > then i made the needed changes in the code, committed them and pushed them > with > > git push upstream master > > However, checking the history of the commands performed I did a > > git fetch upstream master > > before doing the push (don't ask me why). > > Well, the result is a spurius push > https://github.com/geotools/geotools/commit/7ef07b7ad408401d2f96b64516ed97c0475ec0ac > that cointains everything but what i wanted to push :) > Any suggestions on how to move forward (before I make even more mess)? > > Regards, > Simone Giannecchini > == > Our support, Your Success! Visit http://opensdi.geo-solutions.it for > more information. > == > > Ing. Simone Giannecchini > @simogeo > Founder/Director > > GeoSolutions S.A.S. > Via Poggio alle Viti 1187 > 55054 Massarosa (LU) > Italy > phone: +39 0584 962313 > fax: +39 0584 962313 > mob: +39 333 8128928 > > http://www.geo-solutions.it > http://twitter.com/geosolutions_it > > ------------------------------------------------------- > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > GeoTools-Devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/geotools-devel -- Gabriel Roldan OpenGeo - http://opengeo.org Expert service straight from the developers. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ GeoTools-Devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
