oakashes
Joined 4 years ago
Joined 4 years ago
There were four consecutive changed lines in my original commit. When I split it, I selected the deletion and addition for the first two lines. In the resulting newly created commit, those two lines had been moved to below the other two lines, so the order was now 3 -> 4 -> 1 -> 2, with the second commit moving 3 and 4 back to their original places. I didn't figure out a clean way to fix this - when I edited the commit which changed lines 1 and 2 to put them back at the top, it made a conflict with the second commit which I had to repair.
Anybody know what I should have done differently to split the commit and keep the edited lines in their original places?
[0]: https://www.loom.com/share/e3e148f07fb9420180ebb047f5ca94b3
That said, I ran into the same issue someone else mentioned where I really struggled to get my phone to accept single words without a sentence context, the color reading challenge was incredibly frustrating.
Not saying this is a fatal flaw, but there is a bit of a tradeoff there.
> You can tell just by looking at the URLs that those sites are going to be worthelss blogspam.
At least two of the three results in the screenshot are from legitimate baking sites (Cookie and Kate, Sally's Baking Addiction) which are generally trusted sources online. I don't know anything about the third. But Google seems to have actually done a good job of highlighting recipes from reliable blogs.
The points about the compromised experience on those sites due to intrusive ads remain.
1: https://www.washingtonpost.com/lifestyle/kidspost/ever-wonde...
I'd argue that one big benefit of counting calories is that it teaches you that a single piece of sandwich bread contributes a surprisingly high amount of calories to your diet. This potentially empowers you to minmax your plate with the things that will get you the most enjoyment/satiation for your calories.
I switched to the Garmin Vivomove and have been very happy with it. It looks fantastic IMO, the transflective screen is big enough to be useful, and it has only the features I want. The only downsides are that the Garmin Android app is not as well designed as the Withings app and the battery life is only 4 days or so instead of a week, which feels like an awkward amount of time.