Tabs. But really with modern IDE it’s irrelevant. Whatever the tech lead says I guess.

deleted by creator

Yup. But they don’t work. Same problems. They’ll get dog piled by litigation, threats, and investigations. meanwhile said whistle blower is unemployed and getting raked through the mud. Not much protection going on.

The laws are there, sure. But if you become a corporate “whistle blower” you’re not likely to get a job again. And the company will just drown the accusations in fines and litigation and nothing changes because we’re poor and solo, because we’re not unionized because if we try we get fired (again, illegally).

Sigh.

It means the sound a like wouldn’t get paid or employed. And the company would milk the ai voice for free for as long as it’s in business. “reducing overhead” and fucking over the voice actor industry. Which is already pretty raw from lack of lube.

Sounds like I just gotta get better with rebasing. But generally I do my merges clean from local changes. I’ll commit and push, then merge in, push. Then keep working. Not too hard to track but I’ve found it’s the diff at MR time that people really pay attention to. So individual commits haven’t been too crucial.

They’ll likely earn a medal for the investigation!

OK. Query.

Rebase or merge into current?

I personally never rebase. It always seems to have some problem. I’m surely there’s a place and time for rebasing but I’ve never seen it in action I guess.

And nothing will happen to the shit cops.