|
|
|
Re: Multiple Null Pointer Exception Papyrus Compare [message #1824113 is a reply to message #1823888] |
Wed, 08 April 2020 06:36 |
|
Hi Yoann,
the NullPointerException that you've posted doesn't come from Papyrus Compare. When you switch branches, Git changes the files on disk to the state of the other branch to which you are switching.
The actual reason for the NullPointerException seems to be a failed Cut operation (as in Copy, Cut and Paste). It does not seem related to Papyrus Compare or switching branches.
Regarding your message from Dec 24th:
Quote:3/ In parralel, I created the same kind of property (with another name) from a second viewpoint (TWO) in the same composite structure diagram. I commit the changes and check out the master branch. Pull the remote master branch. In this cas I'm not able to merge the new branch but the tool doesn't point me any conflict. Just launch error popup.
Is this suppose to fail?
If conflicts occur, you should get a dialog indicating that the git merge/rebase ended with state "conflicting". After that the conflicting models that are impacted by the conflict should be marked as conflicting (red diamond). Then you should be able to right-click the conflicting model and open them with the Team -> Model Merge Tool. This will open the merge editor showing you the changes and conflicts.
Often it helps to switch to the "by side" grouping in the upper-right area to structure the diffs and conflicts according to the side they have been originally applied to.
Hope that helps,
Philip
--
Philip Langer
Get professional Eclipse developer support:
http://eclipsesource.com/en/services/developer-support/
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.04839 seconds