Upload merge window: why am I asked to choose non-conflicting lines?
I frequently get the "merge" prompt for files after I've done a git stash pop or just switched branches, asking me to pick sides for lines where I'm not seeing a conflict (some lines have the exact same code on both sides but the middle version is different), and this gets in the way not just because of the work caused, but because it also saves any selections from the right side to my local file if it's necessary to get them into the final middle (merged) version, which I don't want locally as they're other developer's changes which I don't want committed on my branch.
That latter issue is its own issue but would be avoided if I didn't get the merge prompt for lines that weren't conflicting that I can see.
I'm using PHPStorm 10 but I'm hoping the dev-to-local copy issue is resolved on merge prompts in the current version.
请先登录再写评论。
Could you please share a screenshot showing the issue?
Do you run the pop command in terminal, or using IDE? What results for the conflict you if you try resolving in the command line?
And is it the same in newer versions, the latest EAP, for example?
I don't have a screenshot, this happened last week on a deploy from my PHPStorm file changes to an external development test server.
My deploy is configured in File > Settings > Build, Execution, and Deployment.
I can deploy using Ctrl+S (Eclipse-type shortcuts) or clicking the Version Control tab at the bottom and right-clicking Default then selecting Upload.
When I did this last week, I got the merge conflict pop-up window then was shown left/middle/right windows where some of the colored left/right line changes were the same.
Can't reproduce this.
Did it happen to you only once, or happens from time to time?