Skip to content

Don't offer to open conflicted files in positron #2157

@hadley

Description

@hadley

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.

Metadata

Metadata

Assignees

No one assigned

    Labels

    gitgit, GitHub, and CI in general

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions