deleted by creator
deleted by creator
Oh this is nice. Thanks for the link!
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.
1, that’s amazing. You are doing such a great thing. And 2, I am sorry for your loss. I hope Jethro grows up big and strong! Keep us in the loop.
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.
Ugh. Fuck the guy with the box. I sure hope you take good care of the kitten.
Tabs. But really with modern IDE it’s irrelevant. Whatever the tech lead says I guess.