Merge conflicts

[DrP1ng]

I'm having a problem when I run "Sync with Remote". I get a message saying "Merge conflicts in: Resolve them or click sync button again push with unresolved conflicts." but whenever I click "Sync with Remote" again the same message is repeated. I also check the GitHub directory and it is empty (just a README.md file that I created).

Any ideas?

[jisotalo]

Same thing here. Testing this for the first time.

I also manually pushed everything to the remote using git (so branch is up-to-date), but still the same error when pressing sync. There are no conflicts.

[kevinmkchin]

Same thing here. Testing this for the first time.

I also manually pushed everything to the remote using git (so branch is up-to-date), but still the same error when pressing sync. There are no conflicts.

IVE BEEN NEGLECTING THIS PLUGIN FOR LIKE MONTHS I WILL TAKE A LOOK AT YALLS ISSUES SOON

[kevinmkchin]

Ok so these actually aren't merge conflicts it's just bad error messages. Something else went wrong during git pull potentially due to the remote URL being invalid.

I've updated the package to be way simpler to set up. Feel free to try again.