Git squash without repetitive conflicts | Heykuki News