Hi Bryan, It sounds like you're not checking the object back in to the VCS after you've made changes and compiled it. If you did, there shouldn't be a difference between the database and VCS revision that would display the differences dialog box the second time around. However, aside from that, this dialog wasn't originally designed to support the merge capability upon check out of an object. It was originally created to simply show the differences between the database and VCS revisions so you could decide which one to load as your baseline version. That being said, I can definitely see the potential benefit of adding merge capability to this dialog. It can help to save a step or two if you come across differences between the DB and VCS sources. As a result, I've made some changes to support this in our current beta product. If you download the beta released later today, you should see this support added. Feel free to give it a shot and let us know on the beta board if that will work for your needs. Thanks, -John
↧