pijul_org / pijul

#245 Display conflicts after pulling in patches

Opened by d3xter, on December 20, 2017
Good first bug
pijul-0.9
Feature
Closed
d3xter commented on December 20, 2017

Right now pijul does not tell you when conflicts happened during applying new patches:

$ pijul pull nest -a
Pulling patches: 100% (5/5), done.
Applying patches: 100% (5/5), done.
$ pijul status #The user has to run `status` manually to see whether any conflicts happened
Unresolved conflicts:
  (fix conflicts and record the resolution with "pijul record ...")

    README
    LICENSE

It would be nice if pijul displays conflicts automatically if any happened:

$ pijul pull nest -a
Pulling patches: 100% (5/5), done.
Applying patches: 100% (5/5), done.
Unresolved conflicts after applying the patches:

    README
    LICENSE

$ 
lthms added tag
pijul-0.9
on December 22, 2017
lthms added tag
Feature
on December 22, 2017
lthms closed this discussion on December 22, 2017