I suggest you ...

← Cornerstone

Built-in file merge tool

Would be very handy if it was possible to resolve file conflicts directly in the application window. Like in NetBeans for example: http://www.netbeans.org/images/v6/5/screenshots/cvs-diff.png

152 votes
Vote
Sign in
Check!
(thinking…)
Reset
or sign in with
  • facebook
  • google
    Password icon
    Forgot password?
    Create a password
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    anonymous shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

    4 comments

    Sign in
    Check!
    (thinking…)
    Reset
    or sign in with
    • facebook
    • google
      Password icon
      Forgot password?
      Create a password
      Signed in as (Sign out)
      Close
      Close
      Submitting...
      • Musi00e0 commented  ·   ·  Flag as inappropriate

        Yes, please allow editing in the application!
        It's clunky to have to switch to XCode, make changes, then diff again in Cornerstone.
        Consider the free p4merge program as one example.

      • ken.earley commented  ·   ·  Flag as inappropriate

        The compare view is great! I like it better than FileMerge. I just wish you could edit/merge in that view.

      Cornerstone

      Feedback and Knowledge Base

      (thinking…)