|Merge tool [message #728413]
||Fri, 23 September 2011 08:49
Registered: September 2011
I have Flash Builder 4.5 (CS 5.5 Premium) which is basically eclipse with some adobe add-ons. I'm using it on a windows PC (tried it on 2 pcs actually) and I can't get EGit's merge tool to work. The merge tool option shows under 'team' in the context menu but it is always muted. Currently if there are merge conflicts, it throws an error and doesn't complete the merge.|
I've seen a video on youtube of someone using Flash Builder and it's working fine.
Do I need to download a special merge tool and configure it to work in eclipse/flash builder?
I know there are some other merge tools out there, but being able to do everything in eclipse would be great and setting up the other tools can be confusing and time-consuming.
PS. I'm running the latest stable release of git for windows and I have Egit 184.108.40.206106090707-r
[Updated on: Fri, 23 September 2011 08:51]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.09778 seconds