Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-14530

Resolve conflict - add branch name to context menu

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Unresolved
    • None
    • Git
    • None

    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      Hi,
      it would be great if in "resolve conflicts" shortcut menu instead of just "their changes" and "my changes" you add also the branch name from wich the change is coming.

      like for conflict risen by the following merge

      Unable to find source-code formatter for language: shell. Available languages are: actionscript, ada, applescript, bash, c, c#, c++, cpp, css, erlang, go, groovy, haskell, html, java, javascript, js, json, lua, none, nyan, objc, perl, php, python, r, rainbow, ruby, scala, sh, sql, swift, visualbasic, xml, yaml
      git checkout develop
git merge feature/nicething

      We see in the context menu resolve with theirs (feature/nicething) and resolve with ours (develop)

            [SRCTREEWIN-14530] Resolve conflict - add branch name to context menu

              Unassigned Unassigned
              ec6cc5760b6e Davide Bacchi
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated: