Cory Sharp <cory.sharp@xxxxxxxxx> writes: > Am I doing something a little wrong or unexpected? Is there a way > around this squash conflict behavior? This doesn't seem to happen > with plain merge without squash. Of course. That's the whole point of recording a merge as a merge. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html