Git Merge Problems

WS 2017.1EAP Windows10

I am trying to merge a branch and although it performs the merge, there is no popup to resolved any conflicts.

 

But I am left at the end with 24 files that show in the IDE as having 60+ conflicts, and contain for example

<<<<<<< .merge_file_a01124
<i class="btn text i-print" data-action="printGrid">|0|Print|</i>
<i class="btn text i-cog" data-bind-visible="System.rights.adminUserSettings" data-action="page"
data-target="common.settings" data-key="expenseItemsSetup">|0|Settings|</i>
=======
<i class="btn text i-print" data-action="printGrid">|17098|Print|</i>
<i class="btn text i-cog" data-bind-visible="System.rights.adminUserSettings" data-action="page" data-target="common.settings" data-key="expenseItemsSetup">|17099|Settings|</i>
>>>>>>> .merge_file_a11268

There seems no way to process these files other than go into each file and manually delete unneeded lines which is slow and error prone.

I dont understand why the resolve conflict popup doesnt show during the merge?

Any ideas or help appreciated
Rob
9 comments

You can open the conflicting file in the editor and choose VCS | Git | Resolve Conflicts from the main menu. See https://www.jetbrains.com/help/idea/2016.3/resolving-conflicts.html

0

I tried that... nothing happens .. the resolve conflict UI doesnt open.


and if I diff the file I get left and right columns blank and everything in the center column and says somthing like 2 changes no conflict.

0

I managed to fix the merge manually using git for windows.

Noticed that although I can pull,commit and push in webstorm other things arent working.

 

Example:Compare with branch.

Couldn't compare with branch: Couldn't compare file [file://C:/workamajig/web/WJApp/core/js/cm.utils.js] with branch [origin/develop];
File C:\workamajig\web\WJApp\core\js\cm.utils.js doesn't exist in branch origin/develop (show balloon

 

The file definitely exists in github on both branches.

0

2017-02-08 23:10:10,275 [ 0] INFO - #com.intellij.idea.Main - ------------------------------------------------------ IDE STARTED ------------------------------------------------------
2017-02-08 23:10:10,340 [ 65] INFO - #com.intellij.util.ui.JBUI - UI scale factor: 1.5
2017-02-08 23:10:10,356 [ 81] INFO - #com.intellij.idea.Main - IDE: WebStorm (build #WS-171.2822.13, 01 Feb 2017 01:10)
2017-02-08 23:10:10,356 [ 81] INFO - #com.intellij.idea.Main - OS: Windows 10 (10.0, x86)
2017-02-08 23:10:10,356 [ 81] INFO - #com.intellij.idea.Main - JRE: 1.8.0_112-release-b702 (JetBrains s.r.o)
2017-02-08 23:10:10,356 [ 81] INFO - #com.intellij.idea.Main - JVM: 25.112-b702 (OpenJDK Server VM)
2017-02-08 23:10:10,362 [ 87] INFO - #com.intellij.idea.Main - JVM Args: -Xms128m -Xmx512m -XX:ReservedCodeCacheSize=240m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -XX:MaxJavaStackTraceDepth=-1 -agentlib:yjpagent=probe_disable=*,disablealloc,disabletracing,onlylocal,disableexceptiontelemetry,delay=10000,sessionname=WebStorm2017.1 -Djb.vmOptionsFile=C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\bin\webstorm.exe.vmoptions -Xbootclasspath/a:C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\lib\boot.jar -Didea.platform.prefix=WebStorm -Didea.paths.selector=WebStorm2017.1 -XX:ErrorFile=C:\Users\rober\java_error_in_webstorm_%p.log -XX:HeapDumpPath=C:\Users\rober\java_error_in_webstorm.hprof
2017-02-08 23:10:10,362 [ 87] INFO - #com.intellij.idea.Main - ext: C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\jre\jre\lib\ext: [access-bridge-32.jar, access-bridge.jar, cldrdata.jar, dnsns.jar, jaccess.jar, jfxrt.jar, localedata.jar, meta-index, nashorn.jar, sunec.jar, sunjce_provider.jar, sunmscapi.jar, sunpkcs11.jar, zipfs.jar]
2017-02-08 23:10:10,363 [ 88] INFO - #com.intellij.idea.Main - JNU charset: Cp1252
2017-02-08 23:10:10,428 [ 153] INFO - #com.intellij.idea.Main - JNA library (32-bit) loaded in 65 ms
2017-02-08 23:10:10,431 [ 156] INFO - penapi.util.io.win32.IdeaWin32 - Native filesystem for Windows is operational
2017-02-08 23:10:10,432 [ 157] INFO - #com.intellij.idea.Main - Using "FocusKiller" library to prevent focus stealing.
2017-02-08 23:10:11,381 [ 1106] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor plugin-intelliLang.xml
2017-02-08 23:10:11,766 [ 1491] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor js-nashorn-support.xml
2017-02-08 23:10:11,988 [ 1713] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor uml-java-support.xml
2017-02-08 23:10:11,997 [ 1722] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor uml-properties-support.xml
2017-02-08 23:10:12,563 [ 2288] INFO - llij.ide.plugins.PluginManager - 72 plugins initialized in 1293 ms
2017-02-08 23:10:12,585 [ 2310] INFO - llij.ide.plugins.PluginManager - Loaded bundled plugins: ASP (0.1), AngularJS (171.2822.13), CSS Support (171.2822.13), CVS Integration (11), CoffeeScript (2.0), Cucumber.js (0.1), Dart (171.2822.13), Docker integration (2.5.1), EJS (171.2822.13), EditorConfig (171.2822.13), File Watchers (171.2822.13), Gherkin (999.999), Git Integration (8.1), GitHub (171.2822.13), HAML (171.2822.13), HTML Tools (2.0), Handlebars/Mustache (171.2822.13), IDEA CORE (171.2822.13), IntelliLang (8.0), Java Server Pages (JSP) Integration (1.0), JavaScript Debugger (1.0), JavaScript Intention Power Pack (0.9.4), JavaScript Support (1.0), Karma (171.2822.13), LESS support (171.2822.13), LiveEdit (171.2822.13), Meteor (171.2822.13), Node.js Remote Interpreter (171.2822.13), NodeJS (171.2822.13), Perforce Integration (2.0), PhoneGap/Cordova Plugin (171.2822.13), Polymer & Web Components (999.999), Pug (ex-Jade) (171.2822.13), QuirksMode (171.2822.13), REST Client (171.2822.13), Refactor-X (2.01), Remote Hosts Access (0.1), SASS support (171.2822.13), SSH Remote Run (0.1), Settings Repository (171.2822.13), Spy-js (171.2822.13), Stylus support (999.999), Subversion Integration (1.1), Task Management (1.0), Terminal (0.1), TextMate bundles support (VERSION), Time Tracking (1.0), UML Support (1.0), Vagrant (0.6.VERSION), Vue.js (171.2822.13), W3C Validators (2.0), XPathView + XSLT Support (4), XSLT-Debugger (1.4), YAML (171.2822.13), Yeoman (171.2822.13), hg4idea (10.0), tslint (171.2822.13)
2017-02-08 23:10:12,585 [ 2310] INFO - llij.ide.plugins.PluginManager - Loaded custom plugins: Base64 image encoder (1.0), BrowseWordAtCaret (3.0.4), FavoriteFolders (1.2.0.1), GoogleIt (0.11), Markdown support (2017.1.20170119), Marks (1.4.0), RegexpTester (1.0.5), Scratch (1.08), Script Monkey (1.2.8), Snip2Code Plugin for IntelliJ (1.8.1), String Manipulation (5.0.135.445.0), SvgViewer 2 (2.0.3), TagMyCode (2.0), Unicode Browser (0.8.1-15.0), doT (1.5.4)
2017-02-08 23:10:13,394 [ 3119] INFO - ij.components.ComponentManager - com.intellij.openapi.components.impl.ServiceManagerImpl initialized in 372 ms
2017-02-08 23:10:13,513 [ 3238] INFO - ellij.util.io.PagedFileStorage - lower=100; upper=200; buffer=10; max=474
2017-02-08 23:10:13,553 [ 3278] INFO - ij.components.ComponentManager - com.intellij.openapi.vfs.newvfs.persistent.PersistentFSImpl initialized in 69 ms
2017-02-08 23:10:13,564 [ 3289] INFO - pl.local.NativeFileWatcherImpl - Starting file watcher: C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\bin\fsnotifier.exe
2017-02-08 23:10:13,587 [ 3312] INFO - pl.local.NativeFileWatcherImpl - Native file watcher is operational.
2017-02-08 23:10:13,587 [ 3312] INFO - ij.components.ComponentManager - com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl initialized in 103 ms
2017-02-08 23:10:13,596 [ 3321] INFO - ij.components.ComponentManager - com.intellij.openapi.vfs.PlatformVirtualFileManager initialized in 114 ms
2017-02-08 23:10:13,772 [ 3497] INFO - pi.util.registry.RegistryState - Registry values changed by user:
2017-02-08 23:10:13,772 [ 3497] INFO - pi.util.registry.RegistryState - dumb.aware.run.configurations = true
2017-02-08 23:10:13,772 [ 3497] INFO - pi.util.registry.RegistryState - editor.allow.multiple.carets = true
2017-02-08 23:10:13,772 [ 3497] INFO - ij.components.ComponentManager - com.intellij.openapi.util.registry.RegistryState initialized in 59 ms
2017-02-08 23:10:13,788 [ 3513] INFO - ij.components.ComponentManager - com.intellij.configurationStore.StoreAwareProjectManager initialized in 15 ms
2017-02-08 23:10:14,330 [ 4055] INFO - ij.components.ComponentManager - com.intellij.openapi.fileTypes.impl.FileTypeManagerImpl initialized in 542 ms
2017-02-08 23:10:14,367 [ 4092] INFO - ij.components.ComponentManager - com.intellij.openapi.keymap.impl.KeymapManagerImpl initialized in 26 ms
2017-02-08 23:10:14,753 [ 4478] INFO - ij.components.ComponentManager - com.intellij.openapi.actionSystem.impl.ActionManagerImpl initialized in 412 ms
2017-02-08 23:10:14,782 [ 4507] INFO - ij.components.ComponentManager - com.intellij.openapi.editor.impl.EditorFactoryImpl initialized in 442 ms
2017-02-08 23:10:14,808 [ 4533] INFO - ij.components.ComponentManager - com.intellij.history.integration.LocalHistoryImpl initialized in 25 ms
2017-02-08 23:10:14,826 [ 4551] INFO - ij.components.ComponentManager - com.intellij.openapi.command.impl.UndoManagerImpl initialized in 17 ms
2017-02-08 23:10:14,851 [ 4576] INFO - #com.intellij.util.ui.JBUI - UI scale factor: 1.25
2017-02-08 23:10:14,869 [ 4594] INFO - ij.components.ComponentManager - com.intellij.ide.ui.laf.LafManagerImpl initialized in 37 ms
2017-02-08 23:10:14,884 [ 4609] INFO - ij.components.ComponentManager - com.intellij.diagnostic.PerformanceWatcher initialized in 14 ms
2017-02-08 23:10:14,918 [ 4643] INFO - ij.components.ComponentManager - com.intellij.internal.statistic.persistence.ApplicationStatisticsPersistenceComponent initialized in 14 ms
2017-02-08 23:10:14,961 [ 4686] INFO - ij.components.ComponentManager - com.intellij.util.net.HttpConfigurable initialized in 27 ms
2017-02-08 23:10:15,234 [ 4959] INFO - ij.components.ComponentManager - com.intellij.util.net.ssl.CertificateManager initialized in 272 ms
2017-02-08 23:10:15,455 [ 5180] INFO - ij.components.ComponentManager - com.intellij.ide.SystemHealthMonitor initialized in 220 ms
2017-02-08 23:10:15,500 [ 5225] INFO - ij.components.ComponentManager - com.intellij.openapi.wm.impl.WindowManagerImpl initialized in 31 ms
2017-02-08 23:10:15,513 [ 5238] INFO - ij.components.ComponentManager - com.intellij.openapi.wm.impl.FocusManagerImpl initialized in 47 ms
2017-02-08 23:10:15,515 [ 5240] INFO - rains.ide.BuiltInServerManager - built-in server started, port 63342
2017-02-08 23:10:15,538 [ 5263] INFO - ij.components.ComponentManager - com.intellij.ide.IdeTooltipManager initialized in 24 ms
2017-02-08 23:10:15,566 [ 5291] INFO - ij.components.ComponentManager - com.intellij.ide.SaveAndSyncHandlerImpl initialized in 28 ms
2017-02-08 23:10:15,586 [ 5311] INFO - gs.impl.UpdateCheckerComponent - channel: eap
2017-02-08 23:10:15,654 [ 5379] INFO - ij.components.ComponentManager - com.intellij.openapi.updateSettings.impl.UpdateCheckerComponent initialized in 80 ms
2017-02-08 23:10:15,697 [ 5422] INFO - ij.components.ComponentManager - com.intellij.openapi.actionSystem.ex.QuickListsManager initialized in 39 ms
2017-02-08 23:10:15,721 [ 5446] INFO - ij.components.ComponentManager - com.intellij.openapi.vcs.changes.actions.migrate.MigrateDiffApplicationComponent initialized in 16 ms
2017-02-08 23:10:15,837 [ 5562] INFO - il.indexing.FileBasedIndexImpl - Index exts enumerated:95
2017-02-08 23:10:15,844 [ 5569] INFO - il.indexing.FileBasedIndexImpl - Index scheduled:7
2017-02-08 23:10:15,845 [ 5570] INFO - ij.components.ComponentManager - com.intellij.util.indexing.FileBasedIndexImpl initialized in 116 ms
2017-02-08 23:10:15,872 [ 5597] INFO - ij.components.ComponentManager - com.intellij.psi.stubs.SerializationManagerImpl initialized in 27 ms
2017-02-08 23:10:15,881 [ 5606] INFO - tellij.psi.stubs.StubIndexImpl - All stub exts enumerated:26
2017-02-08 23:10:15,883 [ 5608] INFO - tellij.psi.stubs.StubIndexImpl - stub exts update scheduled:2
2017-02-08 23:10:15,883 [ 5608] INFO - ij.components.ComponentManager - com.intellij.psi.stubs.StubIndexImpl initialized in 35 ms
2017-02-08 23:10:15,903 [ 5628] INFO - ij.components.ComponentManager - com.intellij.tools.ToolManager initialized in 20 ms
2017-02-08 23:10:15,965 [ 5690] INFO - j.ide.script.IdeStartupScripts - 0 startup script(s) found
2017-02-08 23:10:15,965 [ 5690] INFO - ij.components.ComponentManager - com.intellij.ide.script.IdeStartupScripts initialized in 50 ms
2017-02-08 23:10:15,998 [ 5723] INFO - ij.components.ComponentManager - com.intellij.ide.EvaluationSupport initialized in 25 ms
2017-02-08 23:10:16,013 [ 5738] INFO - ij.components.ComponentManager - org.intellij.plugins.relaxNG.ApplicationLoader initialized in 14 ms
2017-02-08 23:10:16,035 [ 5760] INFO - ij.components.ComponentManager - com.intellij.remoteServer.impl.configuration.deployment.DeployToServerConfigurationTypesRegistrar initialized in 20 ms
2017-02-08 23:10:16,080 [ 5805] INFO - ij.components.ComponentManager - scratch.ide.ScratchComponent initialized in 27 ms
2017-02-08 23:10:16,081 [ 5806] INFO - riptMonkeyApplicationComponent - Nashorn library nashorn.jar found in C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\jre\jre\lib\ext the current jre: C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\jre\jre, version 1.8.0_112-release
2017-02-08 23:10:16,094 [ 5819] INFO - ion.CopyScriptsOnStartupAction - Creating temporary folder for staging files C:\Users\rober\AppData\Local\Temp\ScriptMonkey\js.jar1576233158
2017-02-08 23:10:16,095 [ 5820] INFO - ion.CopyScriptsOnStartupAction - folderName = js
2017-02-08 23:10:16,095 [ 5820] INFO - ion.CopyScriptsOnStartupAction - resourceTmpFolder = C:\Users\rober\AppData\Local\Temp\ScriptMonkey\js.jar1576233158\js
2017-02-08 23:10:16,095 [ 5820] INFO - ion.CopyScriptsOnStartupAction - Exploding jar...C:\Users\rober\.WebStorm2017.1\config\plugins\ScriptMonkey_1.2.x\lib\js.jar
2017-02-08 23:10:16,264 [ 5989] INFO - ij.components.ComponentManager - com.boxysystems.scriptmonkey.intellij.ScriptMonkeyApplicationComponent initialized in 183 ms
2017-02-08 23:10:16,288 [ 6013] INFO - ij.components.ComponentManager - org.intellij.plugins.xpathView.XPathAppComponent initialized in 15 ms
2017-02-08 23:10:16,300 [ 6025] INFO - ij.components.ComponentManager - org.intellij.lang.xpath.xslt.impl.XsltConfigImpl initialized in 11 ms
2017-02-09 00:39:15,015 [ 0] INFO - #com.intellij.idea.Main - ------------------------------------------------------ IDE STARTED ------------------------------------------------------
2017-02-09 00:39:15,078 [ 63] INFO - #com.intellij.util.ui.JBUI - UI scale factor: 1.5
2017-02-09 00:39:15,093 [ 78] INFO - #com.intellij.idea.Main - IDE: WebStorm (build #WS-171.2822.13, 01 Feb 2017 01:15)
2017-02-09 00:39:15,093 [ 78] INFO - #com.intellij.idea.Main - OS: Windows 10 (10.0, x86)
2017-02-09 00:39:15,093 [ 78] INFO - #com.intellij.idea.Main - JRE: 1.8.0_112-release-b702 (JetBrains s.r.o)
2017-02-09 00:39:15,093 [ 78] INFO - #com.intellij.idea.Main - JVM: 25.112-b702 (OpenJDK Server VM)
2017-02-09 00:39:15,097 [ 82] INFO - #com.intellij.idea.Main - JVM Args: -Xms128m -Xmx512m -XX:ReservedCodeCacheSize=240m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -XX:MaxJavaStackTraceDepth=-1 -agentlib:yjpagent=probe_disable=*,disablealloc,disabletracing,onlylocal,disableexceptiontelemetry,delay=10000,sessionname=WebStorm2017.1 -Djb.vmOptionsFile=C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\bin\webstorm.exe.vmoptions -Xbootclasspath/a:C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\lib\boot.jar -Didea.platform.prefix=WebStorm -Didea.paths.selector=WebStorm2017.1 -XX:ErrorFile=C:\Users\rober\java_error_in_webstorm_%p.log -XX:HeapDumpPath=C:\Users\rober\java_error_in_webstorm.hprof
2017-02-09 00:39:15,097 [ 82] INFO - #com.intellij.idea.Main - ext: C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\jre\jre\lib\ext: [access-bridge-32.jar, access-bridge.jar, cldrdata.jar, dnsns.jar, jaccess.jar, jfxrt.jar, localedata.jar, meta-index, nashorn.jar, sunec.jar, sunjce_provider.jar, sunmscapi.jar, sunpkcs11.jar, zipfs.jar]
2017-02-09 00:39:15,097 [ 82] INFO - #com.intellij.idea.Main - JNU charset: Cp1252
2017-02-09 00:39:15,181 [ 166] INFO - #com.intellij.idea.Main - JNA library (32-bit) loaded in 83 ms
2017-02-09 00:39:15,185 [ 170] INFO - penapi.util.io.win32.IdeaWin32 - Native filesystem for Windows is operational
2017-02-09 00:39:15,186 [ 171] INFO - #com.intellij.idea.Main - Using "FocusKiller" library to prevent focus stealing.
2017-02-09 00:39:16,171 [ 1156] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor plugin-intelliLang.xml
2017-02-09 00:39:16,630 [ 1615] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor js-nashorn-support.xml
2017-02-09 00:39:16,887 [ 1872] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor uml-java-support.xml
2017-02-09 00:39:16,889 [ 1874] INFO - llij.ide.plugins.PluginManager - Cannot find optional descriptor uml-properties-support.xml
2017-02-09 00:39:17,579 [ 2564] INFO - llij.ide.plugins.PluginManager - 72 plugins initialized in 1504 ms
2017-02-09 00:39:17,605 [ 2590] INFO - llij.ide.plugins.PluginManager - Loaded bundled plugins: ASP (0.1), AngularJS (171.2822.13), CSS Support (171.2822.13), CVS Integration (11), CoffeeScript (2.0), Cucumber.js (0.1), Dart (171.2822.13), Docker integration (2.5.1), EJS (171.2822.13), EditorConfig (171.2822.13), File Watchers (171.2822.13), Gherkin (999.999), Git Integration (8.1), GitHub (171.2822.13), HAML (171.2822.13), HTML Tools (2.0), Handlebars/Mustache (171.2822.13), IDEA CORE (171.2822.13), IntelliLang (8.0), Java Server Pages (JSP) Integration (1.0), JavaScript Debugger (1.0), JavaScript Intention Power Pack (0.9.4), JavaScript Support (1.0), Karma (171.2822.13), LESS support (171.2822.13), LiveEdit (171.2822.13), Meteor (171.2822.13), Node.js Remote Interpreter (171.2822.13), NodeJS (171.2822.13), Perforce Integration (2.0), PhoneGap/Cordova Plugin (171.2822.13), Polymer & Web Components (999.999), Pug (ex-Jade) (171.2822.13), QuirksMode (171.2822.13), REST Client (171.2822.13), Refactor-X (2.01), Remote Hosts Access (0.1), SASS support (171.2822.13), SSH Remote Run (0.1), Settings Repository (171.2822.13), Spy-js (171.2822.13), Stylus support (999.999), Subversion Integration (1.1), Task Management (1.0), Terminal (0.1), TextMate bundles support (VERSION), Time Tracking (1.0), UML Support (1.0), Vagrant (0.6.VERSION), Vue.js (171.2822.13), W3C Validators (2.0), XPathView + XSLT Support (4), XSLT-Debugger (1.4), YAML (171.2822.13), Yeoman (171.2822.13), hg4idea (10.0), tslint (171.2822.13)
2017-02-09 00:39:17,606 [ 2591] INFO - llij.ide.plugins.PluginManager - Loaded custom plugins: Base64 image encoder (1.0), BrowseWordAtCaret (3.0.4), FavoriteFolders (1.2.0.1), GoogleIt (0.11), Markdown support (2017.1.20170119), Marks (1.4.0), RegexpTester (1.0.5), Scratch (1.08), Script Monkey (1.2.8), Snip2Code Plugin for IntelliJ (1.8.1), String Manipulation (5.0.135.445.0), SvgViewer 2 (2.0.3), TagMyCode (2.0), Unicode Browser (0.8.1-15.0), doT (1.5.4)
2017-02-09 00:39:18,479 [ 3464] INFO - ij.components.ComponentManager - com.intellij.openapi.components.impl.ServiceManagerImpl initialized in 375 ms
2017-02-09 00:39:18,598 [ 3583] INFO - ellij.util.io.PagedFileStorage - lower=100; upper=200; buffer=10; max=474
2017-02-09 00:39:18,639 [ 3624] INFO - ij.components.ComponentManager - com.intellij.openapi.vfs.newvfs.persistent.PersistentFSImpl initialized in 74 ms
2017-02-09 00:39:18,651 [ 3636] INFO - pl.local.NativeFileWatcherImpl - Starting file watcher: C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\bin\fsnotifier.exe
2017-02-09 00:39:18,672 [ 3657] INFO - pl.local.NativeFileWatcherImpl - Native file watcher is operational.
2017-02-09 00:39:18,674 [ 3659] INFO - ij.components.ComponentManager - com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl initialized in 110 ms
2017-02-09 00:39:18,683 [ 3668] INFO - ij.components.ComponentManager - com.intellij.openapi.vfs.PlatformVirtualFileManager initialized in 120 ms
2017-02-09 00:39:18,864 [ 3849] INFO - pi.util.registry.RegistryState - Registry values changed by user:
2017-02-09 00:39:18,864 [ 3849] INFO - pi.util.registry.RegistryState - dumb.aware.run.configurations = true
2017-02-09 00:39:18,864 [ 3849] INFO - pi.util.registry.RegistryState - editor.allow.multiple.carets = true
2017-02-09 00:39:18,864 [ 3849] INFO - ij.components.ComponentManager - com.intellij.openapi.util.registry.RegistryState initialized in 66 ms
2017-02-09 00:39:18,876 [ 3861] INFO - ij.components.ComponentManager - com.intellij.configurationStore.StoreAwareProjectManager initialized in 11 ms
2017-02-09 00:39:19,447 [ 4432] INFO - ij.components.ComponentManager - com.intellij.openapi.fileTypes.impl.FileTypeManagerImpl initialized in 570 ms
2017-02-09 00:39:19,460 [ 4445] INFO - ij.components.ComponentManager - com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl initialized in 12 ms
2017-02-09 00:39:19,484 [ 4469] INFO - ij.components.ComponentManager - com.intellij.openapi.keymap.impl.KeymapManagerImpl initialized in 22 ms
2017-02-09 00:39:20,031 [ 5016] INFO - ij.components.ComponentManager - com.intellij.openapi.actionSystem.impl.ActionManagerImpl initialized in 568 ms
2017-02-09 00:39:20,072 [ 5057] INFO - ij.components.ComponentManager - com.intellij.openapi.editor.impl.EditorFactoryImpl initialized in 610 ms
2017-02-09 00:39:20,110 [ 5095] INFO - ij.components.ComponentManager - com.intellij.history.integration.LocalHistoryImpl initialized in 37 ms
2017-02-09 00:39:20,122 [ 5107] INFO - ij.components.ComponentManager - com.intellij.openapi.command.impl.UndoManagerImpl initialized in 11 ms
2017-02-09 00:39:20,154 [ 5139] INFO - #com.intellij.util.ui.JBUI - UI scale factor: 1.25
2017-02-09 00:39:20,183 [ 5168] INFO - ij.components.ComponentManager - com.intellij.ide.ui.laf.LafManagerImpl initialized in 53 ms
2017-02-09 00:39:20,204 [ 5189] INFO - ij.components.ComponentManager - com.intellij.diagnostic.PerformanceWatcher initialized in 20 ms
2017-02-09 00:39:20,236 [ 5221] INFO - ij.components.ComponentManager - com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent initialized in 13 ms
2017-02-09 00:39:20,260 [ 5245] INFO - ij.components.ComponentManager - com.intellij.internal.statistic.persistence.ApplicationStatisticsPersistenceComponent initialized in 23 ms
2017-02-09 00:39:20,336 [ 5321] INFO - ij.components.ComponentManager - com.intellij.util.net.HttpConfigurable initialized in 52 ms
2017-02-09 00:39:20,685 [ 5670] INFO - ij.components.ComponentManager - com.intellij.util.net.ssl.CertificateManager initialized in 349 ms
2017-02-09 00:39:20,869 [ 5854] INFO - ij.components.ComponentManager - com.intellij.ide.SystemHealthMonitor initialized in 183 ms
2017-02-09 00:39:20,901 [ 5886] INFO - ij.components.ComponentManager - com.intellij.openapi.wm.impl.WindowManagerImpl initialized in 21 ms
2017-02-09 00:39:20,903 [ 5888] INFO - rains.ide.BuiltInServerManager - built-in server started, port 63342
2017-02-09 00:39:20,913 [ 5898] INFO - ij.components.ComponentManager - com.intellij.openapi.wm.impl.FocusManagerImpl initialized in 36 ms
2017-02-09 00:39:20,931 [ 5916] INFO - ij.components.ComponentManager - com.intellij.ide.IdeTooltipManager initialized in 18 ms
2017-02-09 00:39:20,951 [ 5936] INFO - ij.components.ComponentManager - com.intellij.ide.SaveAndSyncHandlerImpl initialized in 20 ms
2017-02-09 00:39:20,967 [ 5952] INFO - gs.impl.UpdateCheckerComponent - channel: eap
2017-02-09 00:39:21,028 [ 6013] INFO - ij.components.ComponentManager - com.intellij.openapi.updateSettings.impl.UpdateCheckerComponent initialized in 70 ms
2017-02-09 00:39:21,063 [ 6048] INFO - ij.components.ComponentManager - com.intellij.openapi.actionSystem.ex.QuickListsManager initialized in 28 ms
2017-02-09 00:39:21,103 [ 6088] INFO - ij.components.ComponentManager - com.intellij.openapi.vcs.changes.actions.migrate.MigrateDiffApplicationComponent initialized in 32 ms
2017-02-09 00:39:21,237 [ 6222] INFO - il.indexing.FileBasedIndexImpl - Index exts enumerated:104
2017-02-09 00:39:21,247 [ 6232] INFO - il.indexing.FileBasedIndexImpl - Index scheduled:10
2017-02-09 00:39:21,247 [ 6232] INFO - ij.components.ComponentManager - com.intellij.util.indexing.FileBasedIndexImpl initialized in 134 ms
2017-02-09 00:39:21,278 [ 6263] INFO - ij.components.ComponentManager - com.intellij.psi.stubs.SerializationManagerImpl initialized in 30 ms
2017-02-09 00:39:21,289 [ 6274] INFO - tellij.psi.stubs.StubIndexImpl - All stub exts enumerated:30
2017-02-09 00:39:21,291 [ 6276] INFO - tellij.psi.stubs.StubIndexImpl - stub exts update scheduled:1
2017-02-09 00:39:21,291 [ 6276] INFO - ij.components.ComponentManager - com.intellij.psi.stubs.StubIndexImpl initialized in 42 ms
2017-02-09 00:39:21,321 [ 6306] INFO - ij.components.ComponentManager - com.intellij.tools.ToolManager initialized in 29 ms
2017-02-09 00:39:21,394 [ 6379] INFO - j.ide.script.IdeStartupScripts - 0 startup script(s) found
2017-02-09 00:39:21,394 [ 6379] INFO - ij.components.ComponentManager - com.intellij.ide.script.IdeStartupScripts initialized in 61 ms
2017-02-09 00:39:21,432 [ 6417] INFO - ij.components.ComponentManager - com.intellij.ide.EvaluationSupport initialized in 31 ms
2017-02-09 00:39:21,452 [ 6437] INFO - ij.components.ComponentManager - org.intellij.plugins.relaxNG.ApplicationLoader initialized in 19 ms
2017-02-09 00:39:21,468 [ 6453] INFO - ij.components.ComponentManager - com.intellij.remoteServer.impl.configuration.deployment.DeployToServerConfigurationTypesRegistrar initialized in 15 ms
2017-02-09 00:39:21,511 [ 6496] INFO - ij.components.ComponentManager - scratch.ide.ScratchComponent initialized in 29 ms
2017-02-09 00:39:21,514 [ 6499] INFO - riptMonkeyApplicationComponent - Nashorn library nashorn.jar found in C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\jre\jre\lib\ext the current jre: C:\Program Files (x86)\JetBrains\WebStorm 171.2272.15\jre\jre, version 1.8.0_112-release
2017-02-09 00:39:21,533 [ 6518] INFO - ij.components.ComponentManager - com.boxysystems.scriptmonkey.intellij.ScriptMonkeySettings initialized in 13 ms
2017-02-09 00:39:21,537 [ 6522] INFO - ion.CopyScriptsOnStartupAction - Creating temporary folder for staging files C:\Users\rober\AppData\Local\Temp\ScriptMonkey\js.jar-1107820250
2017-02-09 00:39:21,537 [ 6522] INFO - ion.CopyScriptsOnStartupAction - folderName = js
2017-02-09 00:39:21,537 [ 6522] INFO - ion.CopyScriptsOnStartupAction - resourceTmpFolder = C:\Users\rober\AppData\Local\Temp\ScriptMonkey\js.jar-1107820250\js
2017-02-09 00:39:21,538 [ 6523] INFO - ion.CopyScriptsOnStartupAction - Exploding jar...C:\Users\rober\.WebStorm2017.1\config\plugins\ScriptMonkey_1.2.x\lib\js.jar
2017-02-09 00:39:21,674 [ 6659] INFO - ij.components.ComponentManager - com.boxysystems.scriptmonkey.intellij.ScriptMonkeyApplicationComponent initialized in 162 ms

0

Log shows no errors. Did you recreate the issue prior to sending it?

0

I tested created a creating a conflict on a single branch, edit a file, shelve it, make a conflicting change to same file and then unshelve the previous change.

 

This works as I would expect, the conflict resolution  screen pop up and I can fix it.

 

Try a similar thing on different branches, make a change on a file push  and commit, switch to another branch make a different change to same file and again commit and push. Then merge the branches.

No conflict resolution pops up. Instead the two conflicting versions of the line appear in the file surrounded by the <<<HEAD ==== >>>>> tags.

The file shows in local changes colored red because of the unresolved conflicts and the merge cannot be commited, attempts to manually launch 'resolve conflicts' from the menu do nothing.

In case it might be a git issue I removed the .git folder and then used git to rebuild the .git for all branches but it made no difference the problem still exists.

 

Is this a problem with my local WS 2017.1 EAP or is this just not a supported feature?

 

0

>The file shows in local changes colored red because of the unresolved conflicts and the merge cannot be commited, attempts to manually launch 'resolve conflicts' from the menu do nothing.

Please try the following:

0

Please sign in to leave a comment.