Where do my incomplete Merges go?

[ben]

I often have to make big merge actions with 50+ files, and 20+ that have conflicts. I start the merge process, but then I have to move onto something else without finishing it. How can I get to the merge that I have started? The "Merge" button on the left is not there when I restart the app, and all the merge changes I made seem to be lost.

How can I find the merge I started but did not complete?

[ollieblanks]

Hey @ben,

I believe the lack of Merge button after restarting the app was a known issue with an older version that was fixed fairly recently. Can you please confirm if you are on the latest version (using the new GUI)?

[ben]

I am using 11.0.16.7419

I wish there was an option to update the app from within the app. Or at least a small notice if I was not using the latest version.

[ollieblanks]

If you are using an older version that did not receive this fix, then performing the exact same merge should bring you right back to where you left off.

Hope this helps!

[ben]

Sorry it wasn't clear, does 11.0.16.7419 have the fix?

[ollieblanks]

Hi @ben, Sorry for not being clearer.

This fix was introduced in 11.0.16.7388

Quote

 

All platforms - PlasticX: Restore a in-progress merge on restart

Now when Plastic is restarted, if there are pending links, the in progress merge is restored. In this case, the Merge tab will be available from the startup and the loaded merge will be the last in-progress merge before the app is closed.