Engineer on @googlechrome. Involved in CSS and W3C standards. Previously @mozilla, @w3ctag. Mastodon: @dbaron@w3c.social
Rockville, Maryland, USA
Joined March 2008
- Tweets 7,521
- Following 1,244
- Followers 4,296
- Likes 18,519
So both the layout and DOM teams at Mozilla have a strong culture of producing small patches where each step compiles. This makes code review of large changes much easier, and also is useful for bisection when debugging regressions. (Other teams too, but probably less strongly.)
1
1
Not clear to me how to dig back to get the patch that I just wrote during the rebase and then I got something else merged into it, after the fact, and then continue the rebase to fix the conflicts on top.
And ways to clean up after the footgun don't mean there isn't a footgun.
1
That doesn't work if you're developing a series of changes that are supposed to make sense separately.
1
(I should note that most of the time in an interactive rebase I type "git commit --amend --no-edit" because I know I don't want to edit the commit message; that also means I don't see the UI that might have given me a hint that stuff was going to go wrong.)
4
Is this a well known problem? Do other people hit this a lot? Is it a well known "be really careful not to do this, or you'll lose your work"?
Because not losing work is one of the core values of version control.
And I'm *this* close to switching back to hg.
11
1
5
If you mess up in conflict resolution mode and type "git commit --amend" (the one difference from edit mode), what happens? The patch you're resolving conflicts in gets magically merged into the patch below it. Two changes, tangled together. One commit message lost.
5
1
4
I do much more of the "edit" mode than the conflict resolution mode. In edit mode, you edit the files, "git add" them, "git commit --amend", and then "git rebase --continue". But in conflict resolution mode, you edit the files, "git add" them, and "git rebase --continue".
2
1
1
3
My work generally involves developing series of patches meant to be on top of each other. With git, this involves a lot of "git rebase -i" (interactive rebase). The problem I hit is the differences between interactive rebase's "edit" mode and rebase's conflict resolution mode.
1
4
Since I've started using git I've lost work and had to rewrite it twice. Both times I ended up with two commits merged together that should have been separate. The second time was just now, and I realized what I did.
1
1
1
So for a long time I did my mozilla development using Mercurial (hg) and patch queues (mq). I've recently switched to using git instead. My mercurial workflow was a bit odd, but it had the advantage that I never lost my work and had to rewrite it. Never.
3
2
6
L. David Baron @dbaron@w3c.social retweeted
July 2019 sea surface temperatures (SSTs) were the warmest for any July on record based on the ERSSTv5 data set. This was the 518th consecutive month where SSTs were warmer than the 20th Century average.@AlaskaWx @IARC_Alaska
2
49
5
57
Any idea, given how full the buses are, what the people/minute counts would look like for a bus lane and how that would compare to the car lanes?
1
L. David Baron @dbaron@w3c.social retweeted
New research finds that, when a neighborhood’s green space leads to better health outcomes, tree canopy provides most of the benefits. trib.al/EgJ4rWM
2
13
3
26
L. David Baron @dbaron@w3c.social retweeted
Ultimately, transit is more than just a mobility strategy, it is a stimulant for new business creation, job generation, and economic development as well, writes @Richard_Florida. trib.al/gILcRvk
6
49
7
111
Many of tthe candidates are doing a bad job of explaining that the debate about criminalization of illegal entry is about whether people can be jailed, and not about whether they've broken the law or can be deported.
L. David Baron @dbaron@w3c.social retweeted
South Dakota is plastering ‘In God We Trust’ on the walls of public schools. It’s mandatory. washingtonpost.com/education…
37
32
9
40
L. David Baron @dbaron@w3c.social retweeted
Great podcast series by the @ChicoER. All of the conclusions are worthwhile but I think this one in particular is worth highlighting. The corollary of building less in fire zones is that we need to make room for more people in areas with low fire risk! @yimbyaction
This tweet is unavailable
3
3