• 0 Posts
  • 305 Comments
Joined 2 years ago
cake
Cake day: July 1st, 2023

help-circle








  • Roughly equal parts “git is clever” and “once in a while, someone has to take some time to figure it out”.

    Say the code is split into two files. You and I both make changes, but you’re working on file A and I’m in file B. No problem!

    Now we both make changes in file A. Sometimes Git can just “figure it out”, like if all your changes are in the beginning of the file, and all my changes are at the end.

    But sometimes we both change the same section. Git can’t figure that part out, so one of us has to sit down and reconcile the changes. Sometimes this is pretty simple, other times…not so much.

    Put it all together, and it works out pretty well most of the time.



  • I’m not really sure, but the nearby “fancy” grocery store is about that distance. 1.2 miles (1.9km), 27 minutes walk, 10 blocks (well, technically 15. Rectangular blocks. I counted two-for-one on the short sides).

    I’ve walked to that store before, but I coordinated with my wife that she would meet me at the store on her way home from work. Walking both ways is just a little outside my “don’t bother” perimeter.

    Hmm, I could probably get used to it if I had to, but I don’t really have any motivation. I already have a car, and the dollar a week to drive to the store won’t break my budget.