BarWidgetr fix missing cfg dir 'touchy'

LinuxCNC / linuxcnc

LinuxCNC controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more.

http://linuxcnc.org/

GNU General Public License v2.0

1.75k stars 1.14k forks source link

BarWidgetr fix missing cfg dir 'touchy' #2852

Open tjtr33 opened 6 months ago

tjtr33 commented 6 months ago

Mistake : delted touchy dir when trying to delte dir tomp So i grabbed a cioy of touchy dir form masterm copied to local repo added all the gile commit, push and now new PR

tjtr33 commented 6 months ago

What is the copnflict? Of course my push has a new lib/pyvcp_widgets.py Thats where master has it and I push a new version.

andypugh commented 6 months ago

I am a bit confused by these PRs. Can you tell me what the current situation is, which are live, and which have been supeceded?

smoe commented 3 months ago

This looks like quite an effort but was a bit overwhelming for me, too :) @tjtr33 , I suggest to rebase your developments to the current master branch and maybe squash all those commits into one that should be reviewed together.