cannot complete git merge

Hello,

Lately I'm unable to complete a merge with conflicts. On the bottom right it says 'merging <branch>' after the conflicts are resolved and then nothing happens. The only thing I can do now is go to TortoiseGIT and abort merge.

Tried PHPStorm 7.0 and 7.1.1. but both don't work anymore. Something todo with a git executable / version? Not aware I've updated it.

Thanks in advance

7 comments
Comment actions Permalink

Can you checkout using git? Please provide git settings screenshot and idea.log files http://intellij-support.jetbrains.com/entries/23352446 .
Also please attach content from Version Control tool window. What is your project structure, how many files it has? It happens with any project?

0
Comment actions Permalink

Hi,

See attachments. In the log file, lines 1 through 14 where produced while merging with conflicts. After that, I've tried to do a git commit, which is not possible during a merge. The lines from line 15 and up where produced during the git commit.

To eliminate the project size I've use two clones each containing only one file. It happens with every project. I have a strong feeling this is caused by some external configuration something something, but have no clue where / how to debug.

Edit: I can do everything with GIT, pull, push, switch, and merge if and only if there are no conflicts :-)



Attachment(s):
versioncontrol.png
gitsettings.png
idea.log.zip
0
Comment actions Permalink

Hello!

Please check http://youtrack.jetbrains.com/issue/IDEA-119453 - does it look similar? If yes, you can try using Git/Repository/Branches/Merge action as a workaround (this way commit is performed automatically)

If it's not your case, please provide exact steps to reproduce the error. idea.log might also help

0
Comment actions Permalink

seems to be the samer issue, as far as I can see from the log


0
Comment actions Permalink

Hello,

I think it is almost the same issue. Maybe you could verify it with the steps described as below. I've reduced the number of steps required to reproduce the issue.

Premise: Got two branches: dev and master. Both contain only one file (file.txt) which should conflict on merge.

Steps to reproduce:
1. VCS > Git > Merge Branches.
2. Check other branch
3. Click Merge button

A dialog 'File merged with conflicts' appears. Resolved the conflict. The screen I've included as attachment. Also the log file.

The suggested work around does work. Maybe interesting to know, here are two outputs of the console tab. The first block is the output generated using the steps above. The second block is the output generated using the workaround.

==block 1==
07:18:35.395: cd D:\temp\mergen\project2
07:18:35.395: git merge master
07:18:37.463: cd D:\temp\mergen\project2
07:18:37.463: git add --ignore-errors -- file.txt
Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt
Automatic merge failed; fix conflicts and then commit the result.
warning: LF will be replaced by CRLF in file.txt.
The file will have its original line endings in your working directory.
==block 1==


==block 2==
07:17:20.868: cd D:\temp\mergen\project2
07:17:20.869: git merge master
Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt
Automatic merge failed; fix conflicts and then commit the result.
07:17:24.843: cd D:\temp\mergen\project2
07:17:24.843: git add --ignore-errors -- file.txt
warning: LF will be replaced by CRLF in file.txt.
The file will have its original line endings in your working directory.

07:17:24.889: cd D:\temp\mergen\project2
07:17:24.889: git commit -F D:\temp\mergen\project2\.git\MERGE_MSG --
[dev 81769da] Merge branch 'master' into dev
==block 2==



Attachment(s):
screenshot2.png
idea2.log.zip
1
Comment actions Permalink

Just reproduced on another machine (OSX instead of Windows), same problem. In the refered issue it mentions the log line "INFO -   git4idea.commands.GitHandler - fatal: cannot do a partial commit during a merge.". We don't get that here, so this might just be another (yet similar) issue. It looks like the merge is done correctly, but not marked as resolved (and the Mark as resolved button is also disabled). No commit attempt is made after the merge.

Hope this is enough info :-)

1
Comment actions Permalink

>We don't get that here, so this might just be another (yet similar) issue

You do have this in your log, for example:

2014-01-28 15:10:06,260 [11147246]   INFO -   git4idea.commands.GitHandler - git commit --only -F C:\Users\marcel\AppData\Local\Temp\git-commit-msg-6056690701974298596.txt -- file.txt .gitignore
2014-01-28 15:10:06,277 [11147263]   INFO -   git4idea.commands.GitHandler - fatal: cannot do a partial commit during a merge.

This is exactly the same issue. See http://youtrack.jetbrains.com/issue/IDEA-119453#comment=27-657057 for explanation

0

Please sign in to leave a comment.