Display no devices configured

[cgalpin]

After adding and then deleting devices, the yaml generated leaves an empty dict and the "No devices configurated" message no longer displays.

BTW, I assume the "configurated" is intentional?

[cgalpin]

I am not sure what I am doing wrong here, but my commit from yesterday is showing up again in this merge request. I thought I was in sync, sorry.

[cgalpin]

Ok, short of deleting my fork and starting over, I can't see why/how the previous merge is showing here. I don't think it will cause any harm. Unless you have any suggestions?

[tmack8001]

Ok, short of deleting my fork and starting over, I can't see why/how the previous merge is showing here. I don't think it will cause any harm. Unless you have any suggestions?

did you resync your master branch? there is never a reason to delete a fork in a distributed file version system

git checkout master
git fetch upstream
git reset upstream/master
# or `git reset --hard upstream/master` to force remove all local changes

[tmack8001]

You could also just create a new branch, likely you added commits into your master branch for the last PR (before creating your feature branch) or created this branch from that prior feature/dev branch?

I'd just rebase this existing branch with upstream/master and force push back here.

git fetch upstream
git rebase upstream/master
# resolve any conflicts... don't think there are any here)
git push -f

This will essentially rewrite the history of your forked branch on top of the merged master branch.

[cgalpin]

I seem to be fine on the subsequent merge request, so maybe i'm ok.

The main problem is likely two fold. I generally just use one branch but I am trying to break the habit. And I usually use the command line but I have been too lazy to figure out the command line auth, so it through my editor which doesn't seem to work as well as the command line. It's kind of a love-hate thing with the IDE - they can be much nicer but for some things I don't see how to do the same as the cli. I also had some weird permission errors pop up which I can't explain. Once those went away things seem to be behaving ok.

I guess if I continue to have problems I'll get back onto the command line.

[chiefwigms]

I'll take a look in a few after the kid goes to sleep

[tmack8001]

@cgalpin I hate almost all VCS integrations in IDEs and exclusively use CLI for all git operations

[chiefwigms]

yeah - looking at your branch, the last merge said it was 2 commits, so something must be missing?

[chiefwigms]

i'd try

git stash
git fetch origin
git merge origin/master
git stash pop

you'll probably get conflicts along the way

[chiefwigms]

Still looks like you're not up to date...

[cgalpin]

Yeah, sorry have been crazy busy. Finally got it sorted out. Will close this and make a new one