Categories
Good programming practice How to Java EE JAVA SE

Conflict merging

In case of conflicts,

1. copy Current changes from Right to left
2. right click on the file, Mark as merged.

Leave a Reply

Your email address will not be published. Required fields are marked *