The two times I've tried cloning this repo (today and about a month ago), the build has not worked because of unresolved conflicts.\r +
Long-term, it would probably be great to add some sort of "branch protection" to Nest to prevent this from happening on branches meant for public consumption.\r +
In the short-term, could maintainers\r +
> Avoid pushing conflicting patches in the future?\r +
This part is very true, and I cannot stress it out too much.
Mmm... This explains a weird behavior I saw in the morning: the problem is that if I push a patch that generates a conflict it is not rejected by the remote (as other CVS do), right?
This is fixed! Thanks a lot.
Also, the master of Pijul refuses to push in a non-fast-forward way, which should pretty much fix this.