Hi,
I’ve updated the Rails gem to latest and then I run THOR_MERGE="code -d $1 $2" bin/rails app:update,
It gets the first changed file and I press h to see list of options, I then press m for merge. This then options the following UI in VSCode:
I’m just at a loss as to how to use this interface. I can’t find any guides about how to use it. Am I meant be edit one of these? If so, which side do I modify? How am I meant to choose which changes I want?
I have previously used xCodes File Merge which gives two panes and a results pane underneath and you go through and choose which changes from each side you want and when you svae the file, the result code in the result pane is what gets saved. That’s the type of UI I expected here.
What i’m presented with I am totally confused with how to use. Can anyone help me out?