The problem

You work in the shop-api repo. Your branch feature/coupons left main at commit a9e72ef and holds 3 commits: 45b9cd6 "Add coupon codes", 25c65af "Apply coupon in cart total" and ae6dc34 "Test coupons". Since then, main got 2 commits: 2951c52 "Fix rounding in cart total" and 1c9f830 "Bump version to 1.5.0". Both the rounding fix and 25c65af change the same line of src/cart.js.

Two more branches exist. release/1.4 still points at a9e72ef, and the 1.4 release needs the rounding fix. feature/export was started from the tip of feature/coupons and adds 1 commit, 5051dd9 "Add CSV export", which only creates src/export.js. You are on feature/coupons with a clean working tree. Reps 2 and 3 continue from rep 1; every other rep starts again from this state.