In Atelier when resolving conflicts with the server the screen shows the Local copy and Server copy and the differences, but depending on where the difference is you cannot tell what what the document is, you need to scroll to the top to see what it is before deciding what to do. It should indicate the class or routine name beside "Conflicting Server documents"
InterSystems Developer Community is a community of
20,841 amazing developers
We're a place where InterSystems IRIS programmers learn and share, stay up-to-date, grow together and have fun!