Can't sync (or push or pull) to/from Git

[LisaLiel]

I have a new installation of Flare 2024 r2. I went to New and chose Open from Source Control. It let me bring in the project that's on Github.

Then I made changes. I committed them to the local repo, and then I tried synching. It gave me this error:

Code: Select all

Pulling local changes from remote...
Pushing changes upstream...
Destination already in use by another project. Please push to an empty remote.

The source control operation finished with warnings and/or errors. Press Close when you are done reviewing the messages.

(What that looks like to me is that once I've gotten the project from Github, Flare is forgetting that fact. And when I hit sync, it thinks I'm trying to push a new project, that isn't on Github, onto Github, with the same name as itself. But I might be misunderstanding.)

The Push and Pull buttons have no effect whatsoever. That is, nothing happens when I click them other than seeing the buttons depress and release.

I went to Manage Remotes, and the URL is correct. I should say that I'm logged into Github using a token, because it didn't want to recognize my SSO creds. So I've tried both https://Github.com/[project] and https://[login]@Github.com/[project] and neither one works.

Finally, I clicked on Branch History. Which gave me this error:

Code: Select all

"MadCap Flare 2024 r2" encountered a problem.

System.NullReferenceException occured at 12/3/2024 9:21:49 AM

Object reference not set to an instance of an object.

The least helpful of all error messages.

I've tried rebooting, reinstalling, and nothing seems to work. Whatever the problem is, and whether it's caused by our side or not, it's an unhandled error from MadCap's side. It let me send a report, which I did, with all of this detail, but I don't know whether they respond to such things, so I thought I'd check here.

1) Has anyone else run into this problem?
2) Does anyone have any suggestions for either fixing the problem or pulling more information that could lead to a solution?

Obviously, without being able to sync, I'm dead in the water.

[AlexFox]

I would recommend that you clone the repo using Git Bash/Command Line into a folder in your Flare Projects folder, then open that copy of the project as a new project. This is how I do it.

Also, make sure you have Git for Windows installed, File > Options (bottom right) > Source Control leave all the options as default, but ensure you select Use the native Windows Secure Channel library under Choosing HTTPS transport backend.

[LisaLiel]

Thanks, Alex. Is Git for Windows the same thing as Git Desktop? Because I have Git Desktop installed, and it doesn't have the options you mentioned.

[LisaLiel]

Cloning the project with Git Desktop solved everything. Thanks!

I would recommend that you clone the repo using Git Bash/Command Line into a folder in your Flare Projects folder, then open that copy of the project as a new project. This is how I do it.

Also, make sure you have Git for Windows installed, File > Options (bottom right) > Source Control leave all the options as default, but ensure you select Use the native Windows Secure Channel library under Choosing HTTPS transport backend.