Month: April 2020

Git Rebase VS Git Merge

Git Rebase VS Git Merge

by rachelgeist ♥ 0 Leave a Comment

Okay, first off, this isn’t going to be a detailed explanation on the eccentricities of git, git rebase and git merge. If you want, that there’s some internets for you to use. (This explanation is pretty good). It’s going to be my thoughts and experience with them.

Git Merge

I’m most familiar with git merge. You switch from your branch over to master, pull down master, switch back over to your branch, merge master in, fix any conflicts, switch back over to master and merge your branch in. The handy thing about git merge is that what you’ve done on your branch doesn’t get overwritten by master. When you do your merges though, you’re going to get all the revision histories for the branches. So if you’re working with a master branch that has a lot of contributors, then your history is going to look a bit messier.

Git Rebase

Rebasing gives you a cleaner revision history. Everything is pretty and linear and your git log will be prettier too. Super cute and fun. However, you’re going to have not as much fun when it comes to conflicts or someone’s been editing the same files you’ve been editing. I’ve had issues where what I’ve written on my local branch was overwritten and it was such a pain to fix and keep track of everything. You can fix all this, but it’s just more of a hassle to resolve, and I’ve gotten into these seemingly unending loops of resolving conflicts for each commit. You can also rebase more frequently which helps.

So which is better? Neither one is better, they serve their own purposes and they both have uses and how you want to use them is up to you. Any thoughts? What do you use most often?

More next time!

-Rachel

Remote Work Day 27: Six Weeks In

Remote Work Day 27: Six Weeks In

by rachelgeist ♥ 0 Leave a Comment

It’s sunny and nice-esque out. It’s still a bit chilly, but it’s sunny. It’s sunny! Hurrah! Well, overall there’s not a ton to update, surprise surprise. I can’t believe it’s been six weeks already. It seems like it’s been forever since I’ve been working at home. Some days are harder than others when it comes to getting Ellie’s school completed and working. I just have to keep reminding myself productivity looks different right now. We’re still working. Boo’s still learning. Calvin’s still napping.

Since I could turn crabby here, I’m going to list a few things that I’ve enjoyed having around at home and am thankful for:

  • My family. Even if they drive me nuts 60% of the time.
  • My kitty. Even though he is a punk and bites sometimes.
  • My job. I’ve been able to keep working and learning.
  • My yard. It’s so nice and green now and all fenced in. It’s great to be able to sit in the back yard.
  • My new robot vacuum. It’s so nice to have floors clean with minimal effort.

More next time! I think that next post I’ll share my thoughts on git rebase vs git merge. I know you’ll be on the edge of you seat with anticipation!

-Rachel

Remote Work Day 17: Still at Home Learning

Remote Work Day 17: Still at Home Learning

by rachelgeist ♥ 2 Comments

Hey All! It’s been a few since I’ve been on here. My goal was to write every day, but you know what? Being home every day just working doesn’t exactly lend itself to riveting storytelling or edge-of-your-seat intrigue. This would be the part in the book that is skipped over in a brief sentence or so. “Weeks from working from home passed until one day. . .” So yeah, sorry. (Not that sorry)

a teal box with an assortment of snacks sitting on a countertop
Work sent a snack box to everyone. It was awesome!

It’s been really nice to see Ellie learn on a daily basis and be a part of her education. I have also really enjoyed just having her around. I know this seems to be the opposite of what most people are saying nowadays, but I miss Ellie a lot during the days when I’m at work. She’s a hoot to be around and is very good at entertaining herself most of the time. This isn’t meant to be a brag or anything, just what’s currently going on.

Overall, I’ve enjoyed working remotely even with the added layer of being teacher. That being said, I’ll be very glad when she’s able to be schooled normally again. Forsooth, I am not an educator. Eighty percent of who she’s learning from is from Ms. YouTube (at least on my end. Brett takes over educating after lunch). Her being the social butterfly she is really misses her friends and getting out. She’s been sending friends and family Marco Polo messages to stay in touch.

I’ve also liked the flexible working schedule. I still stick to my normal hours for consistency, but I can sit out on the deck and work if I wanted to. I can get some laundry started when I’m on a quick break. I do miss being around my co-workers and being able to have the more organic chats about problems. Zoom meetings are just more formal and intentional since you have to find a time that works and have a purpose for them (even if it is just to chat and catch up).

Work-wise, I’m learning more and more about how to set up data for tests and writing tests, and debugging tests. That’s all new and exciting. I don’t have a ton to report on that since I’m still figuring it out and developing an understanding of it. I’ve had to remind myself over and over that learning is hard. Learning takes time and is a process. I can’t know everything immediately.

What have you been learning about? Either from your work from home experience or at work? Let me know!

-Rachel