Announcement

Collapse
No announcement yet.

Where is "Scope of merge conflicts" setting?

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

  • 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.

  • #2
    Is this what you are looking for (under the Session Settings dialog)?

    BC v4.0.7 build 19761
    ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ

    Comment


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

      Comment


      • #4
        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.
        Tim T Scooter Software

        Comment


        • #5
          Ah neat, thanks. (Missed that one completely, was messing around in misc menus).

          Comment

          Working...
          X