> Your reply: “conflicts are resolved by patches” - indicates there was a conflict that needed to be resolved by a human or not?
Yes, conflicts need to be resolved by humans indeed (sorry for misunderstanding your question).
> Your reply: “conflicts are resolved by patches” - indicates there was a conflict that needed to be resolved by a human or not?
Yes, conflicts need to be resolved by humans indeed (sorry for misunderstanding your question).