The invention relates to a method for producing an electrode stack for a battery cell, comprising the following steps: providing a ribbon-shaped anode element (45), providing a ribbon-shaped cathode element (46), providing a first ribbon-shaped separator element (16), producing a ribbon-shaped composite element (50) by means of joining together the cathode element (46), the anode element (45) and the first separator element (16), simultaneously cutting the composite element (50) so as to produce multiple plate-shaped composite segments, stacking the produced composite segments to form a segment stack, stacking multiple segment stacks. The invention relates to a battery cell that comprises at least one electrode stack that is produced according to the method in accordance with the invention.