> OK. I hadn't fully grasped that. That could be worth mentioning somehow
> in the 'push' documentation as well. So what /is/ push doing when there
> are conflicts? :)
It commits the conflicts.
I encourage you to play with
http://www.pps.jussieu.fr/~jch/software/repos/polipo/
On Sun Oct 10, I merge a fix from the stable branch called ``Call
httpClientFinish when failing discardBody.'' At this point, I've got
an unfixed conflict in my repository. Three minutes later (``Fix
merge conflicts''), I've fixed the conflict and recorded the changes.
The conflict is now gone if you get the latest version of polipo;
however, you can still get a copy of the repository as it was when it
still contained a conflict.
> That could be worth mentioning somehow in the 'push' documentation as well.
I hereby nominate you for the position of Great Documentator. This
nomination needs of course to be voted upon by the Academy.
(In other words: thanks for your work on the Wiki.)
Juliusz
|
