mdkcore@fedia.iotoProgramming@beehaw.org•How often do you have to resolve merge conflicts?
2·
1 year agowe are experiencing some conflicts now that some new coworkers started in the company, they are getting used to our workflow
but normally they are quite rare to happen here
when accessing matrix I was using SchildiChat, a fork of Element with improvements
closed my own instance some time ago, but thinking on running it again soon, maybe using Conduit or Dendrite instead of Synapse