How to Manage Conflicts When Multiple Developers Are Working on the Same Parts of the Codebase

With trunk-based development, how do you manage conflicts when multiple developers are working on the same parts of the codebase? Max: It kind of disappears because these changes are small. Your obligation is to pull their changes, go through the three-way merge tool and then have a second go at pushing your thing back up to the canonical place. If we were in that healthscape of long-lived feature branches, it might be days of merge.