search

jnweiger / inkscape-gears-dev

Enhanced version of the well known gears extension, allows spokes, center cross, metric module, best evolute shape ...
52 stars 15 forks source link

Annotation text scales with gear size #17

Closed Neon22 closed 10 years ago

jnweiger commented 10 years ago

This patch set not against head. It is against your last checkout where version == '0.6' -- (it should be '0.7c'). Can you please regenerate this from current HEAD, so that I can merge?

Neon22 commented 10 years ago

I cut and pasted the 0.7c from yours and its created the diff against 0.6. I just can't get git to work :( so the code is the same (well at least I think it is). Could you please cut and paste my gears-dev.py and put it into yours ? If you use notepadd++ there is a compare plugin that works well.

I am totally at a loss about how github is supposed to let me merge down from your master. Supposed to be just: git fetch upstream git merge master/upstream but its got into using some old version...

Neon22 commented 10 years ago

I think I should delete my github repo and start again - but I know it'll do it again next time :(

Neon22 commented 10 years ago

I've asked github for help. else I will delete and start again with fresh fork of your repo. I will commit to redoing all my work. so ignore me for now please.

jnweiger commented 10 years ago

I've attempted a half manual half automatic merge. Please check it out.

And yes, it is extremly easy to shoot yourself in the foot using git. I'll never advise anybody on how to use git. The only good thing about git is the excellent infrastructure provided by github.

Neon22 commented 10 years ago

wow - you did a great job - thanks