Sam2 – I think the Rema in EH goes like you. And I agree the Gemara in Nedarim is pashut not like the Mechaber in OC, and this should be obvious to anyone whoever learned the Gemara. Problem is the chumros in the Gemara are mentioned by the poskim anyway, for example a Tosafos I just learned in Niddah (12a). If I remember correctly the version in Maseches Kallah is a bit different and can shed some light here.
Menu