-
Type:
Suggestion
-
Resolution: Unresolved
-
None
-
Component/s: Git
-
None
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)