# Lots of conflicts

**URL:** <https://discourse.pijul.org/t/lots-of-conflicts/139>\
**Category:** Development\
**Created:** [February 5, 2018, 4:04am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139 "2018-02-05T04:04:47Z")\
**Posts on this page:** 7\
**Page:** 1

<div class="post-metadata">

**Author:** ![joeneeman](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/joeneeman/32/77_2.png) [@joeneeman](https://discourse.pijul.org/u/joeneeman)\
**Post date:** [February 5, 2018, 4:04am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/1 "2018-02-05T04:04:47Z")

</div>

A fresh checkout of pijul doesn’t build, because it’s full of conflicts.

I installed a fresh version of pijul with `cargo install pijul` and then I closed the repository with `pijul clone https://nest.pijul.com/pijul_org/pijul`. The result was a bunch of conflicts. For example, the first few lines of `libpijul/Cargo.toml` are:

```auto
[package]
name = "libpijul"
description = "A patch-based distributed version control system, easy to use and fast."
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
version = "0.9.0-beta1"
================================
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
version = "0.9.1"
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

```

---

<div class="post-metadata">

**Author:** ![pmeunier](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/pmeunier/32/4_2.png) [@pmeunier](https://discourse.pijul.org/u/pmeunier)\
**Post date:** [February 5, 2018, 7:26am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/2 "2018-02-05T07:26:00Z")

</div>

Yes, Pijul 0.9 simplified the algorithm a lot, and our converter had to use libpijul in unusual ways, making many bugs visible. While this is great news in the long run, it’s temporarily a disaster, especially as it happened at the same time as “devops” mistakes I made while managing the Nest.

I believe I’ve fixed those conflicts in a local version, I’ll update pijul on [crates.io](http://crates.io) today.

---

<div class="post-metadata">

**Author:** ![joeneeman](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/joeneeman/32/77_2.png) [@joeneeman](https://discourse.pijul.org/u/joeneeman)\
**Post date:** [February 19, 2018, 7:17pm UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/3 "2018-02-19T19:17:54Z")

</div>

Is there any update on this? The latest [crates.io](http://crates.io) version is still giving me conflicts with a fresh nest clone.

---

<div class="post-metadata">

**Author:** ![pmeunier](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/pmeunier/32/4_2.png) [@pmeunier](https://discourse.pijul.org/u/pmeunier)\
**Post date:** [February 20, 2018, 8:26am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/4 "2018-02-20T08:26:52Z")

</div>

Wow, it’s been two weeks already! I’ve been pretty busy with other things (such as setting up an AFM microscope for my starting experimental project), but I still found some time to improve the test coverage (as measured by kcov) to almost 80%, which helped fix a large number of bugs which I think were responsible for this situation.

I know I’ve promised a new version several times for “today” and “really soon”, so I prefer not to commit to any date, but libpijul is now quite well covered by tests, so I think we’re starting to see the end of the tunnel.

---

<div class="post-metadata">

**Author:** ![pmeunier](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/pmeunier/32/4_2.png) [@pmeunier](https://discourse.pijul.org/u/pmeunier)\
**Post date:** [February 20, 2018, 8:27am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/5 "2018-02-20T08:27:37Z")

</div>

One particular issue is that the current changes are hard to record without being 100% sure that they’ll really be recorded in the correct way.

---

<div class="post-metadata">

**Author:** ![lthms](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/lthms/32/124_2.png) [@lthms](https://discourse.pijul.org/u/lthms)\
**Post date:** [February 20, 2018, 11:12am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/6 "2018-02-20T11:12:09Z")

</div>

I think it could be a good idea to redo the conversion once the bugs will be fixed. Do you plan to do so, @pmeunier?

---

<div class="post-metadata">

**Author:** ![pmeunier](https://yyz1.discourse-cdn.com/flex031/user_avatar/discourse.pijul.org/pmeunier/32/4_2.png) [@pmeunier](https://discourse.pijul.org/u/pmeunier)\
**Post date:** [February 20, 2018, 11:33am UTC](https://discourse.pijul.org/t/lots-of-conflicts/139/7 "2018-02-20T11:33:06Z")

</div>

Yes, I’m actually trying to converting Pijul again right now.