Merging branches taking a long time

This forum is for all Flare issues related to using Source Control.

Merging branches taking a long time

Postby sboltz on Fri Oct 09, 2020 6:16 am

I'm using the latest version of Flare with ADO/git and have been trying to merge a branch into main for the last 2 hours or so. This is my first production trial of using branches. All testing and trials up to now have been rather small. This branch contains a lot of changes, additions, and deletions.

I'm not sure how long is a reasonable amount of time to wait before quitting Flare. The Progress dialog in Flare doesn't show any progress and Task Manager shows Flare using between 26 and 31% CPU throughout the past couple of hours.

Any recommendations on how long I should wait? Will Flare timeout if there isn't activity or it freezes? I'm really not sure what to think because the Progress dialog shows bars with no progress...
Suzette
sboltz
Propeller Head
 
Posts: 21
Joined: Wed Sep 10, 2014 9:59 am

Re: Merging branches taking a long time

Postby BeckyM on Thu Oct 15, 2020 12:35 pm

Hi,
I find that trying to do anything with the source control integration between Flare and git is really slow.
Just changing branches can take several minutes (admittedly I have quite a large project).

If it helps at all, I use the git command line for most of my source control related needs. Just remember to exit out of Flare before switching branch, merging etc. as when you return to it, it will probably hang.

I'm finding that with each update of Flare the source control integration with git gets worse :(
BeckyM
Jr. Propeller Head
 
Posts: 5
Joined: Wed Sep 02, 2015 8:25 am

Re: Merging branches taking a long time

Postby sboltz on Fri Oct 16, 2020 5:32 am

Oh, that's disappointing to hear. One thing I've learned is to close all files before switching branches. I made that mistake a while back and now I close all files, close Flare and reopen to switch branches. And I agree, it is slow, even on smaller projects. I did run into the issue where it doesn't recognize branches created in git and am slowly learning to use git bash.

Do you have any tips for which git commands you find most helpful?
Suzette
sboltz
Propeller Head
 
Posts: 21
Joined: Wed Sep 10, 2014 9:59 am

Re: Merging branches taking a long time

Postby BeckyM on Fri Oct 16, 2020 6:34 am

You might find this site useful:
https://dzone.com/articles/top-20-git-c ... h-examples

The commands I use most often are:
add
branch
checkout
commit
push
pull
status

I just find the command line a lot easier than using git bash or similar.
The help guides for the products I am working on are in the same repositories as the dev code and I often push my changes to the devs branches. For merging branches we use Pull Requests in ADO.
BeckyM
Jr. Propeller Head
 
Posts: 5
Joined: Wed Sep 02, 2015 8:25 am

Re: Merging branches taking a long time

Postby kevinmcl on Mon Mar 29, 2021 8:37 am

THIS thread, right here, is one of the many reasons that a certain company (wink-nudge...) has begun switching from Flare to markdown+Pelican+<some-tools>.

I... er... I mean, some writer... is stuck with Flare because it would take six months of dedicated re-architecting and rewriting of my... er... I mean 'his' project documentation to get it all into markdown. But other products/projects at my.... er... I mean, at some writer's company, have already made the switch and are loving it.

I just started with git-with-Flare mid-last year (having used Flare without Source Control since about 2006). I've done some small branch merges of a few files difference, where Flare just automatically did the merge. I've done some small branch merges where Flare complained about a few conflicts and then nicely presented me with a window on the source file, a window on the destination file, and a third window below, in which to edit/resolve. I did that.
So imagine my surprise when I tried to merge a feature-release branch into develop just last week.

And Flare popped up the usual merge progress window - the one with the two progress bars across the top.
And then it sat there. No color at all on the 'progress' bar. No movement. Two and a half hours later, I figured it was stuck and I clicked the Cancel button. Two hours after that, Windows Task Manager said Flare was still running, but there was no evidence of that in my open Flare instance, and no response to any click or prod. So I forced it to shut down.

Then I shut down my laptop and started up with only the company-mandated apps that launch on boot, plus Flare... no other resource drains like mail or browsers or anything... whoops, I had to close it and delete a Merge-head file and an index-lock file, etc. So I did that and shut down the laptop again and restarted it and Flare and opened my project and I said merge this branch into this branch and the dialog came up again.

This time, 15 hours later, with ABSOLUTELY ZERO INDICATION that anything was happening, I killed it again.

Does anybody know an IDE I can use to compare-and-resolve all the affected files so I can get a successful merge (in whatever other tools I need to use externally), so Flare won't choke when I launch it again?

Is it just me, or are MadCap voices conspicuously absent from this thread?
De gustibus non disputandum est
kevinmcl
Sr. Propeller Head
 
Posts: 246
Joined: Mon Sep 11, 2006 10:58 am

Re: Merging branches taking a long time

Postby BeckyM on Mon Mar 29, 2021 9:01 am

Sometimes in a moment of distraction I forget and try to do something source control related in Flare such as viewing file history... and then immediately kill it because I don't want to sit for hours waiting for nothing to happen!

I use Visual Studio for all of my merge conflict needs!
Visual Studio and the git command line do me just fine.

Not an IDE, but how about GitHub? Haven't used it myself yet, but need to do some work around it soon so will be having a play in the next week or so.
BeckyM
Jr. Propeller Head
 
Posts: 5
Joined: Wed Sep 02, 2015 8:25 am


Return to Source Control

Who is online

Users browsing this forum: No registered users and 3 guests