normalization - Normalizing line endings in a git repository with many branches -

we converted subversion repository git repository using atlassian stash's import subversion tool. part seems have worked though .gitattributes generated seem leave desired.

it created file 7503 entries text diffs unset, text files. shear number of entries result of each file being explicitly listed rather using pattern matching.

to fix created local non-tracking branch off of master called add-gitattributes. within here modified default .gitattributes file looks this: https://gist.github.com/anonymous/6049144 , committed changes add-gitattributes.

i in process of going through process of normalizing line endings in our repository described in how-to-normalize-working-tree-line-endings-in-git. lot of files (5000+) modified according git status, expected.

however, branched master dozen or branches, branches have branches. how normalize line endings of of these branches? can merge git-attributes branch master , update (merge) other branches? new files added in other branches, how normalized? how address conflicts if there any?

you'll want initiate pull request latest code, onto each branch want bring in line ending changes.

1.) commit , push changes master

2.) initiate pull request master each branch want make sure has these changes. @ time have opportunity explain why want other branches merge in changes.

3.) when accept pull request they'll handle conflicts arise @ time.

as new files, you'll have give instructions dev team use line endings want keep. ides can configured use whichever 1 want default when creating or modifying files.