Conflicts with version 0.14.48

Since a new RC is about to be released (to include lib/db: Catch unignored/conflicting files as needed (fixes #5053) by imsodin · Pull Request #5055 · syncthing/syncthing · GitHub) and the final release of 49 will be delayed further (pushing 50 further as well), is there any chance of including this fix in the upcoming 49-RC-4 so that final 49 can include this fix too?

As of now 0.14.50 is at least 1.5 months away at the moment, and this bug turns out to be quite a PITA, with 10s of conflict to clean up pretty much on a daily basis.

Yeah, I somewhat agree, but I’d rather revert the cause than wedge in the local flags stuff, as that can bring infinite new joy.

2 Likes

This topic was automatically closed 30 days after the last reply. New replies are no longer allowed.