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

deleted by creator

Oh this is nice. Thanks for the link!

Connect for lemmy let’s you do thus as well. User, Community, or instance.

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.

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.