unisonweb/unison

create new output message for merge resulting in conflicted patch

Open

#1,206 opened on Feb 5, 2020

View on GitHub
 (0 comments) (0 reactions) (0 assignees)Haskell (304 forks)batch import
help wanted

Repository metrics

Stars
 (6,624 stars)
PR merge metrics
 (Avg merge 12d 19h) (6 merged PRs in 30d)

Description

Here's the current output.

.> merge nsz nsw

  A patch needs to be conflict-free.

  Here's what's changed in nsw after the merge:
  
  New name conflicts:
  
    1. a#ekguc9h648 : Nat
       ↓
    2. ┌ a#5f8uodgrtf : Nat
    3. └ a#ekguc9h648 : Nat
  
  Updates:
  
    4. b#be9a2abbbg : Nat
  
    There were 1 auto-propagated updates.
  
    5. patch patch (added 1 updates)
  
  Tip: You can use `todo` to see if this generated any work to
       do in this namespace and `test` to run the tests. Or you
       can use `undo` or `reflog` to undo the results of this
       merge.

Should explicitly say that it wasn't able to run the patch after the merge, due to conflicts; and should probably come at the bottom, so you actually see it.

Contributor guide

Research direction
Search for the output message in the Unison codebase, likely in the CLI output module. Look for a function that prints the merge result, and add a conditional message when conflicts prevent patch application.
Tech stack
haskell
Domain
cli
Issue type
Feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
1
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Under 1 hour
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
GitHaskell
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
80