Categories Good programming practice How to Java EE JAVA SE Conflict merging Post author By sheberlik Post date May 3, 2016 No Comments on Conflict merging In case of conflicts, 1. copy Current changes from Right to left 2. right click on the file, Mark as merged. ← JPA: mapping and persistence → Inline If statement Leave a Reply Cancel replyYour email address will not be published. Required fields are marked *Comment Name * Email * Website Save my name, email, and website in this browser for the next time I comment.