How does "bringing 2 copies into 1" (aka merge) work?
For big media files, lock / last timestamp is OK.
...but is there anything that helps merge changes in text? Not saying lock/timestamp for *everything* is bad, but IMHO, intelligent auto-merge of text is a main reason git is good.
You've got my attention.
How does "bringing 2 copies into 1" (aka merge) work?
For big media files, lock / last timestamp is OK.
...but is there anything that helps merge changes in text? Not saying lock/timestamp for *everything* is bad, but IMHO, intelligent auto-merge of text is a main reason git is good.