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: 6
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
Senior Propellus Maximus
 
Posts: 4936
Joined: Mon Mar 05, 2007 8:33 am
Location: UK


Return to Source Control

Who is online

Users browsing this forum: Bing [Bot] and 1 guest