I was merging the branch that removed / consolidated bunch of duplicate JSP files (corporate-ui-cleanup).
In the meantime in master, some minor UI changes were made to these files whose content was now elsewhere.
Quick trick how to resolve it fast:
see also version with
CineplexB2B $ git show-branch --current master ! [master] Merged in the last 5 days changes * [bb-master] Merged in the last 5 days changes -- -- [master] Merged in the last 5 days changes
between 2 versions of the file which existed on master - since 13 commits ago
git diff master~13:cineplex/j2ee-apps/cineplex.ear/b2b.war/profile/gadgets/applicationReview_content.jsp master:cineplex/j2ee-apps/cineplex.ear/b2b.war/profile/gadgets/applicationReview_content.jsp
- Save the diff to file
- open the new location
- find “shared” part from the diff
- paste changed parts
To resolve the merge, one must remove the file and add the change in new file
Author Miro Adamy
License (c) 2006-2020 Miro Adamy