How to "accept theirs" during Git merge Follow
Hi,
When I merge 2 Git branches in PhpStorm I often have conflicts. After the merge the conflicted filenames show in red and I see Git's tabs in the file (eg "<<<<<<< HEAD").
In pretty much all cases I want to accept the version of the file from the branch I am mergeing from ("accept theirs").
I've tried following the instructions here: http://www.jetbrains.com/phpstorm/webhelp/resolving-conflicts.html , but I can't figure them out. I can't even figure out how I get this merge tool to appear.
I'm sure I'm missing something obvious somewhere... can someone help please?
Thanks!
Please sign in to leave a comment.
Hello!
>I can't even figure out how I get this merge tool to appear.
Did you follow the instructions from the page you refer to:
"To resolve conflicts, follow these general steps
VCS-specific merge command should open the merge tool...
see the attached screenshot
Attachment(s):
git.jpg
Thanks Elena! I think I was using the wrong context menu, as I didn't have that option...
Hi Elena,
Often when I try this, nothing happens. That is I go to the context menu, select marge conflicts, but the merge tool doesn't open (the file i'm selecting is in conflict and shows in red).
Is this a bug? It's quite frustrating!
I'm running phpstorm 7.0
are you using Git submodules? Looks similar to http://youtrack.jetbrains.com/issue/IDEA-81563
Yes, this is it.
I just upgraded to 7.1.2, but i still have the problem. Is the fix scheduled?
it's not assigned to any version... Not sure if it can be fixed without adding Git submodules support (they aren't currently supported:(). Please watch http://youtrack.jetbrains.com/issue/IDEA-64024