Craig
03/16/2024, 12:56 PMAnthony OConnor
03/16/2024, 3:09 PMCraig
03/16/2024, 3:09 PMAnthony OConnor
03/16/2024, 3:10 PMCraig
03/16/2024, 3:10 PMCraig
03/16/2024, 3:10 PMCraig
03/16/2024, 3:10 PMCraig
03/16/2024, 3:11 PMAnthony OConnor
03/16/2024, 3:12 PMerictgrubaugh
03/16/2024, 3:12 PMAnthony OConnor
03/16/2024, 3:12 PMCraig
03/16/2024, 3:12 PMCraig
03/16/2024, 3:12 PMCraig
03/16/2024, 3:12 PMCraig
03/16/2024, 3:12 PMAnthony OConnor
03/16/2024, 3:12 PMCraig
03/16/2024, 3:12 PMCraig
03/16/2024, 3:13 PMCraig
03/16/2024, 3:13 PMCraig
03/16/2024, 3:13 PMAnthony OConnor
03/16/2024, 3:13 PMAnthony OConnor
03/16/2024, 3:13 PMAnthony OConnor
03/16/2024, 3:13 PMCraig
03/16/2024, 3:13 PMCraig
03/16/2024, 3:14 PMAnthony OConnor
03/16/2024, 3:14 PMCraig
03/16/2024, 3:14 PMAnthony OConnor
03/16/2024, 3:14 PMCraig
03/16/2024, 3:14 PMCraig
03/16/2024, 3:14 PMAnthony OConnor
03/16/2024, 3:15 PMCraig
03/16/2024, 3:15 PMAnthony OConnor
03/16/2024, 3:15 PMCraig
03/16/2024, 3:15 PMCraig
03/16/2024, 3:16 PMCraig
03/16/2024, 3:16 PMCraig
03/16/2024, 3:16 PMCraig
03/16/2024, 3:17 PMAnthony OConnor
03/16/2024, 3:17 PMCraig
03/16/2024, 3:17 PMAnthony OConnor
03/16/2024, 3:17 PMCraig
03/16/2024, 3:17 PMCraig
03/16/2024, 3:18 PMAnthony OConnor
03/16/2024, 3:18 PMCraig
03/16/2024, 3:18 PMCraig
03/16/2024, 3:18 PMAnthony OConnor
03/16/2024, 3:18 PMCraig
03/16/2024, 3:19 PMCraig
03/16/2024, 3:19 PMAnthony OConnor
03/16/2024, 3:20 PMCraig
03/16/2024, 3:21 PMCraig
03/16/2024, 3:21 PMAnthony OConnor
03/16/2024, 3:21 PMerictgrubaugh
03/16/2024, 3:21 PMmain
branch to represent Production-ready code and then a branch per feature/fix/task/whatever
• For major, complex features, I introduce a short-lived release
branch to consolidate the features for that release
• I don't use environment-specific branches or a dev
branch
• If a team of developers is regularly working in the same files and stepping on each other, that feels like both a code smell and an operational smell to me. The code has not been decomposed into separate modules enough, and the resource allocation has not spread the developers out across features/fixes.
• "We move fast" always raises my eyebrow.Craig
03/16/2024, 3:23 PMCraig
03/16/2024, 3:23 PMCraig
03/16/2024, 3:24 PMCraig
03/16/2024, 3:24 PMCraig
03/16/2024, 3:26 PMerictgrubaugh
03/16/2024, 3:26 PMmain
plus feature/*
), and collisions were pretty rare because we:
• spread out our developers across different areas of the code, and
• broke down our code into small-ish modules
The collisions we did have were almost always in these large catch-all utility modules we had that desperately needed refactoringCraig
03/16/2024, 3:27 PMerictgrubaugh
03/16/2024, 3:28 PMCraig
03/16/2024, 3:28 PMAnthony OConnor
03/16/2024, 3:29 PMerictgrubaugh
03/16/2024, 3:31 PMAnthony OConnor
03/16/2024, 3:32 PMbattk
03/16/2024, 3:34 PMCraig
03/16/2024, 3:35 PMAnthony OConnor
03/16/2024, 3:35 PMCraig
03/16/2024, 3:36 PMCraig
03/16/2024, 3:36 PMAnthony OConnor
03/16/2024, 3:36 PMCraig
03/16/2024, 3:37 PMAnthony OConnor
03/16/2024, 3:37 PMbattk
03/16/2024, 3:37 PMCraig
03/16/2024, 3:37 PMAnthony OConnor
03/16/2024, 3:37 PMCraig
03/16/2024, 3:38 PMbattk
03/16/2024, 3:38 PMCraig
03/16/2024, 3:38 PMCraig
03/16/2024, 3:39 PMbattk
03/16/2024, 3:39 PMCraig
03/16/2024, 3:39 PMCraig
03/16/2024, 3:40 PMAnthony OConnor
03/16/2024, 3:40 PMCraig
03/16/2024, 3:40 PMCraig
03/16/2024, 3:40 PMAnthony OConnor
03/16/2024, 3:40 PMbattk
03/16/2024, 3:40 PMbattk
03/16/2024, 3:41 PMCraig
03/16/2024, 3:41 PMCraig
03/16/2024, 3:41 PMCraig
03/16/2024, 3:42 PMCraig
03/16/2024, 3:43 PMAnthony OConnor
03/16/2024, 3:43 PMCraig
03/16/2024, 3:43 PMAnthony OConnor
03/16/2024, 3:46 PMAnthony OConnor
03/16/2024, 3:48 PMCraig
03/16/2024, 3:53 PMCraig
03/16/2024, 3:55 PMAnthony OConnor
03/16/2024, 3:56 PMCraig
03/16/2024, 3:57 PMCraig
03/16/2024, 3:57 PMCraig
03/16/2024, 3:58 PMerictgrubaugh
03/16/2024, 4:03 PMCraig
03/16/2024, 4:03 PMAnthony OConnor
03/16/2024, 4:04 PMalien4u
03/17/2024, 3:51 PMenv/SB2
• Dev 1 working on feature/fix1
• Dev 2 working on feature/fix2
• ....
Devs ALWAYS
merge to env/SB2
before they upload files.
All your problems solved.Craig
03/17/2024, 6:19 PMalien4u
03/17/2024, 6:21 PMalien4u
03/17/2024, 6:22 PMCraig
03/17/2024, 6:23 PMalien4u
03/17/2024, 6:23 PMCraig
03/17/2024, 6:24 PMCraig
03/17/2024, 6:25 PMalien4u
03/17/2024, 6:26 PMCraig
03/17/2024, 6:30 PMCraig
03/17/2024, 6:32 PMbattk
03/17/2024, 9:54 PMCraig
03/17/2024, 9:55 PMCraig
03/17/2024, 9:55 PMbattk
03/17/2024, 9:58 PMbattk
03/17/2024, 9:58 PMbattk
03/17/2024, 9:59 PMbattk
03/17/2024, 9:59 PMCraig
03/17/2024, 9:59 PMCraig
03/17/2024, 9:59 PMCraig
03/17/2024, 10:00 PMCraig
03/17/2024, 10:01 PMCraig
03/17/2024, 10:01 PMbattk
03/17/2024, 10:02 PMCraig
03/17/2024, 10:07 PMCraig
03/17/2024, 10:10 PMCraig
03/17/2024, 10:11 PMbattk
03/17/2024, 10:12 PMbattk
03/17/2024, 10:12 PMCraig
03/17/2024, 10:12 PMCraig
03/17/2024, 10:12 PMCraig
03/17/2024, 10:13 PMbattk
03/17/2024, 10:15 PMbattk
03/17/2024, 10:15 PMCraig
03/17/2024, 10:15 PMbattk
03/17/2024, 10:17 PMCraig
03/17/2024, 10:17 PMCraig
03/17/2024, 10:18 PMCraig
03/17/2024, 10:18 PMCraig
03/17/2024, 10:19 PMbattk
03/17/2024, 10:19 PMCraig
03/17/2024, 10:19 PMbattk
03/17/2024, 10:19 PMCraig
03/17/2024, 10:20 PMCraig
03/17/2024, 10:20 PMCraig
03/17/2024, 10:20 PMbattk
03/17/2024, 10:21 PMCraig
03/17/2024, 10:21 PMCraig
03/17/2024, 10:25 PMalien4u
03/17/2024, 10:45 PMCraig
03/17/2024, 10:46 PMCraig
03/17/2024, 10:46 PMCraig
03/17/2024, 10:50 PMerictgrubaugh
03/17/2024, 10:52 PMerictgrubaugh
03/17/2024, 10:53 PMShawn Talbert
03/18/2024, 4:17 PMCraig
03/28/2024, 4:57 PMAnthony OConnor
03/28/2024, 5:02 PMAnthony OConnor
03/28/2024, 5:02 PMCraig
03/28/2024, 5:02 PMerictgrubaugh
03/28/2024, 5:07 PMif multiple devs are working on the same scripts, at the same timeIMO this is a code smell and a planning smell, not a tooling smell
Anthony OConnor
03/28/2024, 5:08 PMCraig
03/28/2024, 5:23 PMCraig
03/28/2024, 5:23 PMCraig
03/28/2024, 5:23 PMCraig
03/28/2024, 5:24 PMCraig
03/28/2024, 5:24 PMalien4u
03/28/2024, 5:25 PMAnthony OConnor
03/28/2024, 5:25 PMCraig
03/28/2024, 5:25 PMCraig
03/28/2024, 5:26 PMAnthony OConnor
03/28/2024, 5:26 PMAnthony OConnor
03/28/2024, 5:26 PMCraig
03/28/2024, 5:27 PMCraig
03/28/2024, 5:27 PMShawn Talbert
03/28/2024, 7:46 PMCraig
03/28/2024, 7:58 PMCraig
03/28/2024, 7:58 PMShawn Talbert
03/28/2024, 7:58 PMCraig
03/28/2024, 7:59 PMShawn Talbert
03/28/2024, 7:59 PMShawn Talbert
03/28/2024, 8:01 PM