On Dec 22, 2011, at 5:02 AM, Craig Small wrote: > I was actually doing it the right way, despite what both of you are > saying. It was a trivial fix too. > > It should be right now, its looking ok to me and I've pushed the commits > to gitorious. > > git reset doesn't work too well on remote branches. If you reset locally, then merge, patched and pushed with force it would have worked. Your current solution is unacceptable. I feel very strongly about this, Craig. You must reverse your error and then follow a correct merge-patch approach. Otherwise, I'll be obliged to say goodbye. Jim