usethis
usethis copied to clipboard
Don't offer to open conflicted files in positron
e.g.
pr_merge_main()
✔ Pulling changes from "origin/main".
Merge has resulted in merge conflict(s).
ℹ There are 2 conflicted files:
• R/snapshot-reporter.R
• tests/testthat/test-snapshot-file.R
Do you want to proceed with this merge?
This just doesn't feel that useful any more.
Just to confirm: you think we should offer to open the files in, e.g., RStudio, but not in Positron? Is this about the different facilities offered by those 2 IDEs for resolving merge conflicts?
Correct.