Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BarWidgetr fix missing cfg dir 'touchy' #2852

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

tjtr33
Copy link

@tjtr33 tjtr33 commented Jan 18, 2024

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 added 3 commits January 11, 2024 13:48
new styles of bars.
new dirs for dwgf and imgf custom 'thunb' files,
new config dir  tomp
dir tomp contains suite of files for an embeeded tab in Axis gui
new driver 'ran08' to make 'live' data for bar
@tjtr33
Copy link
Author

tjtr33 commented Jan 18, 2024

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.

tjtr33 and others added 4 commits January 18, 2024 15:52
…ata for man pages, removed unwanted files, remove config leaf 'tomp'. TODO dload fork and build to see mnakefiels work, sync to upstream ( hahah i dont know what that means )
…-0 git rm --cached try to rember to use git rm from now on
@andypugh
Copy link
Collaborator

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
Copy link
Contributor

smoe commented Apr 21, 2024

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants