TFS - conflicts RRS feed

  • Question

  • Hi,
    I see a tab that shows "Resolve Conflicts" in TFS
    There are three conflicts, so I click on one of them and it shows:
    There are conflicting content changes in the local and the server versions
    Your local version is: 723 The server version is 789
    When I click on 723, I see the .sql in server which is on LHS and the one in local which is on RHS
    Th eone on the RHS is the latest code file.
    What do I need to do to resolve this conflicts please?

    Thank you

    Monday, September 16, 2019 8:00 AM