WWII was probably the last major warfare when we saw melee combat between China and Japan. The weapon of choice for the Chinese side is the Dadao (literally "Big Saber"), while the Japanese is famous for their Banzai Charge with their long rifles with a bayonet attached. If we were to relate this to medieval combat, it will be something like "Swords versus Spear", since the length of the Japanese rifle + bayonet is almost 2x longer than the Dadao. Even in Chinese martial arts