git - How to go to the merge menu if I already close it once in intellij idea? -


i use idea git integration use git.
merged brabch develop branch , saw lot of conflicts. cloased merge window , see following file content:

<<<<<<< head             //for unregistered users unfilled email             if (userservice.finduserbyemail(newemail) != null) {                 return new responseentity<>(                         msgsource.getmessage("registcontroller.user_exists", null, locale_ru),                         httpstatus.accepted);             }             long userid = (long) session.getattribute(user_id);             user = userservice.finduserbyid(userid); =======             terminaluser user = null;             long userid = (long) session.getattribute(user_id);             if (userid == null) {                 user = userservice.createemptyuser();                 session.setattribute(user_id, user.getuserid());             }else {                  user = userservice.finduserbyid(userid);             } >>>>>>> remotes/origin/wrike1234567890 

and idea signs merge not completed:

enter image description here

how return merge menu?

locate file conflicts in changes tool window. (if open in editor use altf1 , select changes)

right click on file in changes tool window , select menu git > resolve conflicts... (this menu item not available on files without conflicts, might called little differently because don't see right now).


Comments

Popular posts from this blog

asp.net mvc - SSO between MVCForum and Umbraco7 -

Python Tkinter keyboard using bind -

ubuntu - Selenium Node Not Connecting to Hub, Not Opening Port -