Fork norihiro-w/ogs is not mergable
Because file history of basic libraries such as BaseLib or GeoLib was broken in norihiro-w/ogs@f3f1373 and norihiro-w/ogs@bde16d3 merging in code changes from or to ufz/ogs is not possible anymore (in a clean way).
Files have to be moved or renamed with git mv
. Please consider using tools such as GitHub for Windows or look up the correct git usage in its documentation.