Merge Tool broken since AppCode 3.0

Hello All,

Just wondering if people who have upgraded to AppCode 3.0 are now having problems with in built merge tool?

Since updating to AppCode 3.0 my colleagues and I are having problems when using the merge tool and it doesnt correctly merge when selecting between the local and server side.

So far from what I have seen this problem has occured 100% of the time with merging project files and so far merging code hasnt appeared to be a problem yet but after speaking to my colleague the problem can sometimes occur when merging code.

I have already raised this as problem here.

3 comments
Comment actions Permalink

I've been having the same problem exactly.  I e-mailed support and they responded with a note that there was a bug filed for this (the bug you filed, in fact).  Thanks for opening the ticket!

0
Comment actions Permalink

no problem! I have been tracking the ticket for a while and glad that its being actioned very quickly the past couple of day and hopefully the fix shouldn't be too far off.

0
Comment actions Permalink

We are already working on the fix. It will be available in the next bug-fix update

0

Please sign in to leave a comment.