Support interactive merging of changes performed on existing files ------------------------------------------------------------------ Key: FORGE-1129 URL: https://issues.jboss.org/browse/FORGE-1129 Project: Forge Issue Type: Feature Request Components: UI - API, UI - Eclipse, UI - IntelliJ IDEA, UI - Shell Reporter: Vineet Reynolds Fix For: 2.x Future Currently, in Forge 1, we merely prompt the users to overwrite the existing file if located. Either the existing file is lost or the changes made by Forge are not saved. No attempt is made to retain the existing file with changes performed by the user, while merging in changes performed by Forge. Forge should support interactive diffing and merging of the changes made on the existing file. Integration with existing diff tools in various IDEs and shells would be a plus. This should ideally be exposed as a service for other addons.