-
Checkin to γ΄γ£γ»γγ»γγ©γ³γΉ γγγΏιεΊ
Sharing some bread with Leo. -
How to Split Commits
by JamesSometimes in a rush developing, I'll commit two distinct changes in a single commit. From a code perspective, this isn't an issue because the code works. But from a systems perspective you can no longer split changes from A and B. They're forever married.Β
Splitting those changes into two commits will allow us to keep a better history of the system and allow our pull request to "tell a better story".
We can fix combined commits with an interactive rebase. I use PyCharm for part of this in my regular workflow at work, so rather than providing a concrete example, I'll instead summarize the procedure.- git rebase -i origin/mainΒ (or whatever branch you rebase on to) to start an interactive rebase.
- Find the commit you want to split and mark it as "edit"
- git reset HEAD~1
- Add the files / changes for change A, commit
- Add the files / changes for change B, commit
- git rebase --continue
The "secret" is that when you edit stops the rebase after the combined commit. By resetting HEAD~1, we effectively undo that commit. But since it's a soft reset, the changes are not rolled back, just the commit. This allows us to tweak and commit individual parts separately as desired before continuing to the next commit in our branch. -
Checkin to Enoshima Aquarium (ζ°ζ±γε³Άζ°΄ζ逨)
Wouldβve been nice to not have to protestors out front. I get it though. Nice view π -
Response to
by JamesI went to the dentist and when I returned to the bicycle rack I discovered my broken lock laying on the pavement. No bike. I looked at the security guard standing by the door, pointed, and gave him a look. He said, βOh. That was your bike?β
...
But San Francisco has lots of hills and the difference between a fast easy bike ride vs. an arduous uphill journey is rendered moot with just a teeny tiny bit of extra oomph.There's heaps of hills in Yokohama, too, and the extra oomph makes all the difference. It's so much easier to navigate and park our bikes than a car. And with the assist even with 15kg of kid on the back,Β the steepest hills remain surmountable without breaking a sweat. This machine fights climate change π².
Also so nice to see the photos, of just how common e-bikes are becoming in US. And those bike lanes and some proper infrastructure. π -
Checkin to ζ¨ͺζ΅εΈζ³ε ¬δΌε
Waiting for a Christmas performance by Leoβs pre-school to start. Heβs playing a sheep π.
