hidehide55

How to resolve "Some files have been left conflicted!”?

2

Thank you for providing a great plugin. Whenever I start Obsidian, I get the following message: ``` Some files have been left conflicted! Please resolve them by "Pick a file...

"error reading server preface" under proxy environment.

2

**Describe the bug** I am running the flyctl command on a PC under a proxy server for internet access. The proxy server is specified in the https_proxy environment variable. Since...