Merge versions showing wrong differences
Hi,
I am using the version merge function in Scroll Versions 3.6.0. When I click show differences, I get a page showing the differences but it reverses the changes. In other words, if I have a 'production' version called 2.4, and I edit a branch of it called 2.4-1, then when I want to merge the changes made in 2.4-1 to 2.4 and I click on show differences for a specific page, it shows the content in 2.4 as the 'text changed/text added' and the new text added in 2.4-1 has the line through with red highlight for 'text deleted.' It's as if the differences were calculated on the incorrect assumption that 2.4 was branched from 2.4-1, not the other way around.
When I compare the versions using the compare versions option in the Confluence UI I get a correct comparison.
Any advice would be appreciated as I would love to use the compare versions function when merging a page.
Regards,
Nicholas
-
Hi Nicholas,
Thanks for reaching out.
If you select the merge option in version 2.4 and merge this version into 2.4.1, the dialog should show the differences as expected.You can then still select which page version you want to keep (e.g. 2.4.1 in your case). Would that work for you?
Best,
Nils -
Hi Nils,
Thanks for the quick response, I followed your recommendation and it results in the following:
- The differences are shown correctly.
- The Merge Version dialog asks "Please select which page version should be kept in '2.4.1'." Therefore, selecting 2.4.1 basically means nothing will be changed, and 2.4 also stays the same.
In our case this will not work because 2.4 is the 'live' version which can be viewed via the Viewport, and therefore we created 2.4.1 as a 'dummy' to make changes and merge the validated changes to 2.4, which will then be available to clients.
What we now have to do is compare the versions by selecting the merge option in 2.4, then exit and apply the merge by selecting the merge option in 2.4.1. Although this does not stop us from using the function, it seems completely counter-intuitive and makes this great function frustrating to use.
Regards,
Nicholas
-
Hi Nicholas,
Sorry for the delayed answer - I've created an issue in our JIRA System (see https://k15t.jira.com/browse/VSN-3470). I'm totally on your side here, that the current behavior is not ideal from a UX standpoint.
I hope you can still use the mentioned workaround in the meantime to use the diff / merge functionality in Scroll Versions.
Please sign up at https://k15t.jira.com/secure/Signup!default.jspa to watch, comment on or vote for this issue. We'll then send a notification for every status update.
Best,
Nils
Please sign in to leave a comment.
Comments
3 comments