12/11/2023 0 Comments Smartgit compare two branches![]() I am using also SmartGit which has some features which I am missing at Sourcetree: I know that I can do this in the log view by selecting two commits with Cmd, but this is very annoying. It's possible to make other decisions and merge the models again.Sometimes I have to compare different commits and branches. Optional: Review the written merged model.When clicking "Start Merge" LemonTree writes the merged model.LemonTree GUI comes up, shows the conflicts/changes and waits for the user to manually merge the models.The message "LemonTree merged your models successfully" appears.ī) LemonTree is NOT able to merge automatically:.When merging two different revisions of models SmartGit will always come up with a conflicted file since binary files cannot be merged automatically.Īfter double-clicking on the conflicted file LemonTree starts automatically and tries to resolve the conflict with 2 possible outcomes:Ī) LemonTree is able to merge automatically: ![]() Whenever you click "Show Changes" (F4) or "Compare with working tree" LemonTree is started automatically and shows the requested diff. To avoid typos here are the command and the arguments:įile Pattern: *.eap, *.eapx, *.qea, *.qeaxĬommand: C:\Program Files\LieberLieber\LemonTree\Īrguments: diff -base=$ Working with LemonTree in SmartGit Comparing different revisions of modelsĬomparing different models works like comparing text files or source files. Click "Add" and configure LemonTree as external diff tool like this:.Select the subelement "Diff Tools" in the category "Tools".In the menu "Edit → Preferences" is a category "Tools".Manual Integration Diff-Tool integration of LemonTree for *.eap files Please note that the integration hooks aren't automatically removed when uninstalling LemonTree. Impacted Elements / Impacted Diagrams Listįiltering Impacted Elements / Impacted Diagrams and the Tree Browserĭiagram Visualization Differences to Enterprise Architectįiltering Impacted Elements / Impacted DiagramsĬheck if Models provided by the Version Control Systems are Readableĭetermining the used Version Control System (VCS) Version ![]() Minimum Detected Severity of Inconsistencies Resolving Inconsistencies in the Base ModelĪutomatic Resolution of Inconsistencies During Merge Resolving Inconsistencies via the Enterprise Architect Integrity Check Using LemonTree when working with Enterprise Architect Version Controlĭifference between LemonTree Inconsistency Check and Enterprise Architect Integrity Check Working with Feature-Branches in a Subversion Environment Setting up a Git Repository for the LemonTree EA Addin Git Features TortoiseSVN Integration (Version 2.6 or older) SourceTree Integration (Version 2.6 or older) SmartSVN Integration (Version 2.6 or older) SmartGit Integration (Version 2.6 or older) PTC Integrity Lifecycle Manager (ILM) Integration (Version 2.6 or older) ![]() TortoiseSVN Integration (Version 2.6.1 or newer)ĭirect Git Integration (Version 2.6 or older) TortoiseGit Integration (Version 2.6.1 or newer) SourceTree Integration (Version 2.6.1 or newer) SmartSVN Integration (Version 2.6.1 or newer) Video - Integrating LemonTree into SmartGit for the best Enterprise Architect Git Expierence SmartGit Integration (Version 2.6.1 or newer)ĭiff-Tool integration of LemonTree for *.eap filesĬonflict Solver integration of LemonTree for *.eap files PTC Integrity Lifecycle Manager (ILM) Integration (Version 2.6.1 or newer) Direct Git Integration (Version 2.6.1 or newer)
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |