Does the Merge Tool work for anyone?

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

Does the Merge Tool work for anyone?

Postby Frog24 on Tue Jul 11, 2017 12:49 pm

Hi all,

Does anyone have a working Merge Tool? We're experiencing all sorts of strange errors, and since issues with the tool seem to stem back to Flare 8 (according to these forums), I just wanted to ask if anyone is using the tool successfully.

Thanks!

Jane
Frog24
Jr. Propeller Head
 
Posts: 7
Joined: Fri Dec 16, 2016 10:37 am

Re: Does the Merge Tool work for anyone?

Postby Dave Lee on Wed Jul 12, 2017 12:33 am

Depends what you mean by working!

I very rarely have to use the merge tool, but yesterday I did successfully merge two separate changes.
However, I noticed the next/previous (?) buttons to review/accept each change were disabled (greyed-out). So I only had the option to OK/accept the changes.

I don't know if that's normal for the merge tool or not.
Dave Lee
Master Propellus Maximus
 
Posts: 5022
Joined: Mon Mar 05, 2007 8:33 am
Location: UK

Re: Does the Merge Tool work for anyone?

Postby chrispitude on Wed Oct 25, 2017 6:57 am

Hi Dave,

In a case where Flare did successfully figure out the merge, the Previous/Next buttons were ghosted for me too, and I couldn't select/deselect any changes in the review panes. In a more complicated scenario where it couldn't figure out the merge, then Previous/Next were clickable and I was able to select things. The Previous/Next buttons might change depending on whether the merge was "figure-outable" or not.

However, I'm now fighting a case (using Git) where Previous/Next are clickable but don't do anything, and none of the changes do anything, and OK is ghosted. I'm unable to do anything at all except stare at the window. I'll file a bug, although I hope the response is not "it works fine for us, check with your IT department." :)
chrispitude
Propeller Head
 
Posts: 55
Joined: Thu Mar 23, 2017 12:23 pm


Return to Source Control

Who is online

Users browsing this forum: No registered users and 3 guests