LemonTree already wrote the merged file to the correct file location. Select "Leave as is" in the dialog and confirm with "Resolve".Right-Click on the conflicted file and select "Resolve." (Strg+Shift+V).Or B) Manually tell SmartGIT the conflict has been resolved: Warning - Please do not press "Stage" before the conflict has been solved with LemonTree.
![rebase with smartgit rebase with smartgit](https://i.stack.imgur.com/wyoB1.jpg)
When LemonTree has done its work an additional step is necessary to tell SmartGIT that the conflict is resolved: It's possible to make other decisions and merge the models again.
![rebase with smartgit rebase with smartgit](https://download.zone/wp-content/uploads/2019/07/configuration.png)
![rebase with smartgit rebase with smartgit](https://www.syntevo.com/assets/images/products/smartgit/whats-new/v20-2/add-subtree-ee77bff9.png)
In the menu "Edit → Preferences" is a category "Tools".
REBASE WITH SMARTGIT MANUAL
Manual Integration Diff-Tool integration of LemonTree for *.eap files Please note that the integration hooks aren't automatically removed when uninstalling LemonTree.