I suggest that you read (all of)


and then perhaps ask a question based on more understanding of the merge
model and ancestry tracking.   The short answer is that git will work
quite well in terms of conflict management if your development practices
are sane.

Attachment: pgpfYcrdcMcOS.pgp
Description: PGP signature

Reply via email to