Shidel commented on merge request !1 at FreeDOS Archive / Development / euphoria

Shidel
2022-02-05T14:27:30Z

Not sure what was going on with this merge. I would tell it to merge. It would say ok and that it did it without a problem. But, the files were not changing. Very strange. The only thing I can think of is maybe a conflict. Possibly changes to a couple metadata files in this repo that had not been updated in the other repo were causing some sort of conflict. But, if that was the case, it should complain about it.

But since it looks like the branch, update and merge worked, at least it is now updated.