Announcement

Collapse
No announcement yet.

Switch from 3 way to 2 way (and back)

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

  • Switch from 3 way to 2 way (and back)

    I am in a situation where a 3 way merge is useful most of the time but sometimes I need to switch to the 2 way view.

    Is this possible from the gui?

    Kr, Tom

  • #2
    Hello,

    You can hide the center pane or detach the output pane from the View menu. You can also use the Session menu to Compare Output pane to (Specific Side) to launch a new tab comparing the output to the target.
    Aaron P Scooter Software

    Comment


    • #3
      Hello,

      Sorry to "kind of" hijack the thread but I have a question that is related to buckley's one.

      => I am in a situation (resolving svn merge conflics) where a 3 way merge is useful most of the time but sometimes I need to switch to a 2 way view, comparing the CENTER pane (the ancestor revision in SVN) with the RIGHT pane (the last revision in SVN) or the LEFT pane (my file not yet commited). Is it possible from the gui?

      The Compare Output pane will no do it because it always compare with the output pane.

      Thank in advance.
      ZartC.

      Comment


      • #4
        Hello,

        With the main top 3 panes already aligned from Left to Center and Right to Center, you could switch the Display Filter to "Show Right Changes" to then concentrate on just the Center <-> Right comparison.
        Aaron P Scooter Software

        Comment


        • #5
          I have a similar issue. I'm using Git on Windows with BC Pro. 99% of the time seeing BASE isn't useful. What I really want is to hide BASE (or even kill it altogether in .gitconfig) and see the differences between LOCAL and REMOTE. How can I do this?

          Comment


          • #6
            Hello,

            The View menu -> Center Pane can hide the center information.

            The Center should be the common Ancestor of the Left and Right sides, and is often very useful for determining conflict status. Most Version Control Software's core logic revolves around the existence of the Ancestor and History. Without an Ancestor, every difference is an equally weighted conflict and every change must be manually reviewed. With an Ancestor, users can determine which side has been edited since their last checkout by themselves or others, so they can more quickly review and accept differences where the other party has not edited the same section of code.
            Aaron P Scooter Software

            Comment

            Working...
            X