Announcement

Collapse
No announcement yet.

Where is "Scope of merge conflicts" setting?

Collapse
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • GreenMoose
    Guest replied
    Ah neat, thanks. (Missed that one completely, was messing around in misc menus).

    Leave a comment:


  • Tim
    replied
    You don't need to start a merge session to access this option. On the "Open Session" page you can edit any session settings for your saved sessions and you can edit the defaults for new sessions.

    Leave a comment:


  • GreenMoose
    Guest replied
    Ah thanks. (A bit awkward that I had to start a merge session to get this merge-conflict-box to show IMHO).

    Leave a comment:


  • Michael Bulgrien
    replied
    Is this what you are looking for (under the Session Settings dialog)?

    Leave a comment:


  • GreenMoose
    Guest started a topic Where is "Scope of merge conflicts" setting?

    Where is "Scope of merge conflicts" setting?

    I searched the forum for conflicts and found that there should be a setting "- Scope of merge conflicts" somewhere. But I can't find it.
    The thing is VStudio tells me a file has 0 conflicts, Cirrus says 2.
    The lines "conflicting" are within a 3 line-scope.

    Where do I change the scope for treating these as conflicts or not?

    Thanks.
Working...
X