How can we improve Azure DevOps?

Merging when one branch moved a file and a different branch modified it in place.

When resolving a merge conflict in VSO where one branch moved a file and a different branch modified the file in place there isn't a easy way to accept the modifications in the file's new location.

I believe git knows the difference between a file delete and file move and this is possible?

2 votes
Sign in
Check!
(thinking…)
Reset
or sign in with
  • facebook
  • google
    Password icon
    Signed in as (Sign out)

    We’ll send you updates on this idea

    Kurt Diegert shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

    1 comment

    Sign in
    Check!
    (thinking…)
    Reset
    or sign in with
    • facebook
    • google
      Password icon
      Signed in as (Sign out)
      Submitting...
      • Kurt Diegert commented  ·   ·  Flag as inappropriate

        Thinking about this more. Should this situation even create a merge conflict? If branch 1 moved foo.txt to bar.txt and branch 2 added a line to foo.txt then they should be automatically merged -- just add the new line to bar.txt.

        The key is knowing the difference between when a file is deleted and when a file is moved, and I believe git does know the difference.

      Feedback and Knowledge Base