pijul_org / pijul

#355 Conflicts on master branch

Opened by courajs, on February 2, 2019
Closed
courajs commented on February 2, 2019

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 + \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 + \r + In the short-term, could maintainers\r +

  1. fix the current conflicts?\r + and\r +
  2. Avoid pushing conflicting patches in the future? I think always pulling and checking for conflicts first before pushing would accomplish it.\r + \r + Additionally, could anyone help me figure out how to intelligently "choose" one side or the other of the conflict? Effectively un-applying patches until there's no more conflict, but keeping the more-useful-looking side of the conflict?\r+ \r + Thanks
lthms commented on February 3, 2019

> Avoid pushing conflicting patches in the future?\r + \r + This part is very true, and I cannot stress it out too much.

tae commented on February 3, 2019

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?

pmeunier commented on February 27, 2019

This is fixed! Thanks a lot.

pmeunier commented on February 27, 2019

Also, the master of Pijul refuses to push in a non-fast-forward way, which should pretty much fix this.