Two development teams.
Two branches.
We merge into theirs: 596 files
They merge back into ours: 250,000 files.
*grabs popcorn*
#WebDev #MergeConflicts #SprintEndsTomorrow
#SprintEndsTomorrow
Client Info
Server: https://mastodon.social
Version: 2025.04
Repository: https://github.com/cyevgeniy/lmst