Another solution to this situation is to squash your changes in place so that your branch is just 1 commit, and then do the rebase against your master branch or equivalent.
Works great if you're willing to lose the commit history on your branch, which obviously isn't always the case.
I know for me, at least with gnome, toggling between performance, balanced, and battery saver modes dramatically changes my battery life on Ubuntu, so I have to toggle it manually to not drain my battery life if it's mostly sitting there. I don't know if Mint is the same, but just throwing out the "obvious" for anyone else running Linux on a laptop.
Out of curiosity, what switch are you using for your setup?
Last time I looked, I struggled to find any brand of "home tier" router / switch that supported things like configuring vlans, etc.
Maybe I am not thinking of the access control capability of VLANs correctly (I am thinking in terms of port based iptables: port X has only incoming+established and no outgoing for example).
I think of it like this: grouping several physical switch ports together into a private network, effectively like each group of ports is it's own isolated switch. I assume there are routers which allows you to assign vlans to different Wi-Fi access points as well, so it doesn't need to be literally physical.
Obviously the benefits of vlans over something actually physical is that you can have as many as you like, and there are ways to trunk the data if one client needs access to multiple vlans at once.
In your setup, you may or may not benefit, organizationally. Obviously other commenters have pointed out some of the security benefits. If you were using vlans I think you'd have at a minimum a private and public vlan, separating out the items that don't need Internet access from the Internet at all. Your server would probably need access to both vlans in that scenario. But certainly as you say, you can probably accomplish a lot of this without vlans, if you can aggressively setup your firewall rules. The benefit of vlans is you would only really need to setup firewall rules on whatever vlan(s) have Internet access.
I ran into the same thing. I've always just worked around it, but I believe I did find the solution at one point (can't find the link now).
But if I am remembering right, I believe you need to manually create a bridge between the two networks - by default it isolates the VMs from TrueNAS itself for security reasons.
Sorry I can't link the exact fix right now, but hopefully this will help you Google the post I found on the subject.
I'm pretty sure @[email protected] has said before what he uses. I thought back in the day it was publicly listed with the expenses, but I couldn't find it.
The most recent update I found was here: https://lemmy.world/post/75556
But it could definitely be old information, I'd take the other commenter's advice and ask in the admin channel to be sure.