I've got problem related to this ticket - http://youtrack.jetbrains.com/issue/IDEA-75800. I renamed branch in command line and since that time i cant do merge from trunk, PHPStorm always throws me an error "Merge start wasn't find".
1. Is there anyway to set manually number of revision i want make merge from to avoid that IDE look for the point by itself?
2. I don't know what's happened, now i can see two records in merge tab (see screenshot), how to remove second record?