search

ARCAD-Software / elias-vscode

ARCAD-Elias VSCode extension
Other
2 stars 0 forks source link

RFE: Compare+merge and checkout from another version #21

Closed petterjohansson closed 1 week ago

petterjohansson commented 1 month ago

image Compare is available, but also need compare in edit mode (compare and merge).

Would be great to have the option to checkout a component from the history pane: image

sebjulliand commented 1 month ago

Checkout from history has been added in the upcoming v2.1 (will be released soon, first half of June). image

I'll see what can be done for Compare in edit mode.

sebjulliand commented 1 month ago

OK, version 2.1 will include this action at the component level (repository & version): image

This will let you choose a version of the component to compare with. If this is run on a component in a version that can be edited, you'll be able to merge directly from the diff editor: image

sebjulliand commented 1 week ago

Elias v2.1 is out! https://github.com/ARCAD-Software/elias-vscode/releases/tag/2.1.0