ColdFusion Component Changes Causing Git Merge Conflicts in Generated Files
Nobody Wrote This File: Ending Git Merge Conflicts From ColdFusion Generated Artifacts Two developers each add a property to a different persistent CFC. Both changes are small and unrelated. Both branches pass review. Then the merge fails with conflicts in files neither developer ever opened. Read More