pijul_org / pijul

#256 [SOLVED] unresolved conflicts after fresh clone of this repo

Opened by yory, on April 28, 2018
Closed
yory commented on April 28, 2018

After a fresh clone, I get this error:

Unresolved conflicts:
  (fix conflicts and record the resolution with "pijul record ...")

        Cargo.toml
        Cargo.lock
        libpijul/src/patch.rs
        libpijul/src/apply/apply.rs

I think that @lthms already reported it, but I can't find it anymore. I think it was among the lost discussions.

lthms commented on April 28, 2018

You need to use pijul-0.10.1 to avoid those conflicts. Is it your case?

yory commented on April 28, 2018

yes, i was on 0.10.0. confirmed fixed in 0.10.1. sorry for the noise!

lthms commented on April 28, 2018

No worries, feel always free to report bugs when you find them; it might turn out it has already been fixed, but that's not a problem.