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

Post a Comment

Popular posts from this blog

jquery - How do you format the date used in the popover widget title of FullCalendar? -

Image
in fullcalendar, how format date used in popover widget title when clicking '+n more'? code: <div class="fc-popover fc-more-popover"> <div class="fc-header fc-widget-header"> <span class="fc-close fc-icon fc-icon-x"></span> <span class="fc-title">tuesday, april 7</span> ... </div> ... </div> you use daypopoverformat that. determines date format of title of popover created eventlimitclick option. must date formatting string. default value "dddd, mmmm d" english , "ll" other languages.
Read more

asp.net mvc - SSO between MVCForum and Umbraco7 -

i need integrate sso between mvcforum (forum of company) , umbraco7 (manages cms company). however struggling shared authentication work. tried several ways suggested on other threads still not running expected. here did: 1. in mvcforum (forum.mywebsite.com) 1.1. machine key in web.xml: <machinekey validationkey="the same key umbraco7" decryptionkey="the same key umbraco7" validation="sha1" decryption="aes" /> 1.2. authenticate forms in web.xml <forms name="my-sso-auth" protection="all" path="/" timeout="43200" domain="forum.mywebsite.com" loginurl="/members/logon" enablecrossappredirects="true" /> 2. in umbraco7 (news.mywebsite.com) 2.1. machine key in web.xml: <machinekey validationkey="the same key mvcforum" decryptionkey="the same key mvcforum" validation="sha1" decryption="aes" /> 2.2. a...
Read more

Python Tkinter keyboard using bind -

i have problem using bind option can click button in keyboard, , call function once key pressed. tried taking other codes have similar purpose , saw i'm doing pretty same, though still have problem must've missed. thankful if me this. here's code: # -*- coding: utf-8 -*- #imports tkinter import * pil import imagetk, image import time import tkmessagebox #===========================================================================================================================================# #tkinter class class app(frame): def __init__(self, master=none): frame.__init__(self, master) self.pack() #===========================================================================================================================================# #game pieces classes class board: def __init__(self, rows = 7, columns = 6, picture_height = none, picture_width = none): self.rows = rows self.columns = columns self.picture ...
Read more