There are plenty of tools that have started popping up to try and improve this situation since last year. CodeTogether, Duckly, Code With Me, and GitLive to name a few. Source: over 2 years ago

GitLive. Extend your IDE with the real-time features remote development teams need to work together effectively. See what your teammates are working on and get notified of merge conflicts before you commit. Make video calls and code together live, VS Code to JetBrains. [GITLIVE]. - Source: dev.to / about 3 years ago

This is in no way an answer to your question but perhaps you would find git.live's merge conflict detection feature useful to potentially avoid the conflicts in the first place 😅. Source: about 3 years ago

Secondly, your vulva and vagina is not suppose to smell like flowers or fruit. As long as the smell is not fishy or overwhelmingly unpleasant then it is fine. A fishy smell can be a sign of an infection. Itching or burning can also be a sign of infection. Discharge is totally normal! It’s only a sign of something bad if it smells, as I said above, is a strange colour like green, or has the consistency of cottage... Source: about 1 year ago

Try using a period tracker app like Flo. Source: about 1 year ago

I'm a journalist and I'm writing an informational article on vulvodynia for Flo Health. Nothing fancy, just speaking to medical experts about causes, symptoms, treatments and research. Source: about 2 years ago

I recommend downloading an app where you can track symptoms (I personally love Flo, which is free). If you end up going to a doctor to discuss your experience, having that as a reference could be incredibly helpful! Source: about 3 years ago