Boyd Lynn Gerber wrote:
>git-roxen
>error: Could not read 063677f14fd73ca1ccace84ab629f3964960a955
This is a small wart still in the repository, nothing critical though.
>>From git://git.cuci.nl/roxen
> 081a4c8..888c097 5.0 -> origin/5.0
> + a5f8d24...e835622 BuGless -> origin/BuGless (forced update)
> * [new branch] BuGless.mast4 -> origin/BuGless.mast4
> 081a4c8..888c097 master -> origin/master
>Auto-merged server/base_server/prototypes.pike
>Auto-merged server/base_server/roxen.pike
>CONFLICT (content): Merge conflict in server/base_server/roxen.pike
>Auto-merged server/base_server/roxenloader.pike
>Auto-merged server/etc/modules/Roxen.pmod
>Auto-merged server/modules/database/sqltag.pike
>Auto-merged server/modules/tags/rxmltags.pike
>Auto-merged server/protocols/http.pike
>Automatic merge failed; fix conflicts and then commit the result.
Seems that you are doing a pull somewhere, and are trying to automerge
one of the branches here with your currently checked out branch (which is?).
--
Sincerely,
Stephen R. van den Berg.
"Beware: In C++, your friends can see your privates!"
|