Skip to content

WVS

    • Loading...
  • My Projects
  • Help
    • Getting started?
    • Documentation
    • FAQ
    • Issues
    • Support
  • Sign in
  • WVS Issues WVS Issues
  • Activity
    • Activity
  • Issues 204
    • Issues 204
    • List 204
    • Boards
    • Milestones
  • Project Tools
  • Project Members
    • Project Members
  • Activity
  • Create a new issue
  • Issue Boards
Collapse Menu
  • WVS-Public
  • WVS IssuesWVS Issues
  • Issues
  • #1136

Closed
Open
Created Dec 17, 2023 by Marcel Samek@marcelOwner

CLI does not allow use of wildcard when resolving files

After a Sync operation, the repository can contain a large number of conflicted files. On a project this can easily be dozens or even hundreds if a long-lived work branch, for example, is being updated from main.

The CLI currently does not allow the use of a wildcard to resolve conflicts and the user would need to resolve the files one by one, which can be impractical.

Expected behavior:

  1. Provide an option that allows the user to "resolve all" with either --our or --their and thus be able to resolve a large set of conflicts in a single operation.
  2. Allow the use of wildcard patterns, like most of the other CLI commands do, which would allow different folders to be resolved as needed
Assignee
Assign to
Time tracking