> > Just a random idea, how about each time writing timestamps to > a different file name "timestamps.$HashOfClassSourceFile" > Then git would never complain of a conflict(??). >
If I understand your proposal correctly, that would imo result in the following: accumulating endless list of timestamps.XXX files (there are no conflicts and thus no mechanism to get rid of them) still having conflict, because the #sourceHash is different (any two independent changes to a line will trigger conflict) plus added complexity and a lot more reading/processing CPU/disk required P
