Bind to Source Control Hanging (Git)

This forum is for all Flare issues related to using Source Control.
Post Reply
amycatesch
Propeller Head
Posts: 12
Joined: Fri Aug 07, 2015 6:03 am

Bind to Source Control Hanging (Git)

Post by amycatesch »

I bound my project to Git and it was working great for a few days.

I just tried to do a push after editing a few pages and Flare crashed. When I reopened Flare, the project was no longer bound to source control. I tried to bind the project again, just as I did originally a few days ago, but it will not bind and I get this error:

LibGit2Sharp.MergeConflictException
8 conflicts prevent checkout.
If you were in the middle of somkething, your changes might be lost.
...

Any advice? I have to be able to bind the project to source control again.
stownsendaw
Jr. Propeller Head
Posts: 7
Joined: Tue Nov 17, 2015 12:22 pm

Re: Bind to Source Control Hanging (Git)

Post by stownsendaw »

Binding is really a one-time thing with a project. Once it's been bound, if something goes wrong you're better off completely removing the Source Control bindings by editing the .flprj file in Notepad++ and trying again.

I'd recommend adding the source to your Git management system of choice (GitHub, Stash, etc.), cloning a local repo to get your .git folder, and then telling Flare to use Git as your source control by adding the appropriate lines to your .flprj file.
Post Reply