Skip to main content


Eclipse Community Forums

      Home
Home » Polarsys » Capella workbench » Anomalies when using GIT-CAPELLA coupling (merge tool)(When using GIT -CAPELLA coupling to solve a conflict with the merge tool two kinds of anomalies raise: not possible to launch merge tool or not possible to re-open .aird after conflict resolution)
Anomalies when using GIT-CAPELLA coupling (merge tool) [message #1831838] Mon, 31 August 2020 11:04 Go to next message
Eclipse UserFriend
When using GIT -CAPELLA coupling to solve a conflict with the merge tool two kinds of anomalies raise: not possible to launch merge tool or not possible to re-open .aird after conflict resolution

see details in the attached file

[Updated on: Mon, 31 August 2020 11:05] by Moderator

Re: Anomalies when using GIT-CAPELLA coupling (merge tool) [message #1831887 is a reply to message #1831838] Tue, 01 September 2020 16:20 Go to previous messageGo to next message
Eclipse UserFriend
Hi,

its seems there is a Sirius issue when using the merge tool while the aird session is opened.
If you close your aird (right click in it on Project Explorer > Close) before doing the Merge Tools it seems to work properly.

I will create a bugzilla to trace this issue. (https://bugs.eclipse.org/bugs/show_bug.cgi?id=566573)

[Updated on: Tue, 01 September 2020 16:23] by Moderator

Re: Anomalies when using GIT-CAPELLA coupling (merge tool) [message #1832184 is a reply to message #1831887] Fri, 11 September 2020 02:56 Go to previous message
Eclipse UserFriend
Thanks for you answer, but
Closing the .aird before using merge tool (and also GIT merge and some GIT commands that modifies the eclipse files) is clearly mentionned in the Capella HELP contents, so I do it ... and I have the problems with merge tool that I mention in may post.
Previous Topic:PVMT property value and mass editing view
Next Topic:Image as a Note
Goto Forum:
  


Current Time: Thu Jul 10 01:25:37 EDT 2025

Powered by FUDForum. Page generated in 0.29306 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top

Sign up to our Newsletter

A fresh new issue delivered monthly