we checking in binary files git. problem git not shows conflicts/changes while merging. accepts file , overwrites there conflicts. not sure whether git understands binary files or not. please , provide suggestions.
note: binary files generated our own tool.
if binary files generated, should not put in git repo in first place.
when merging, there conflict if binary file has been update in both branches (the source , destination branches of merge). in case, shown in "resolving git conflict binary files", there conflict.
if binary file has been updated in source branch, overwrite same file in destination branch of merge.
Comments
Post a Comment