XAML files are recognized as binary by git

@Karthik_S wrote:

All XAML files in my project are recognized as binary by git. Hence I’m unable to use diff or resolve conflicts when merging xaml files.

This is the response I get when I rebase:

First, rewinding head to replay your work on top of it...
Applying: init apps
warning: Cannot merge binary files: Main.xaml (HEAD vs. init apps)
warning: Cannot merge binary files: Framework/GetTransactionData.xaml (HEAD vs. init apps)
Using index info to reconstruct a base tree...
M       Framework/GetTransactionData.xaml
M       Main.xaml
Falling back to patching base and 3-way merge...
Auto-merging Main.xaml
CONFLICT (content): Merge conflict in Main.xaml
Auto-merging Framework/GetTransactionData.xaml
CONFLICT (content): Merge conflict in Framework/GetTransactionData.xaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 init apps
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

This is the attributes of xaml file when I run git check-attr --all Main.XAML
Main.xaml: binary: set
Main.xaml: diff: unset
Main.xaml: merge: unset
Main.xaml: text: unset

I tried adding the below text to .gitattributes
.xaml diff
yet the attributes of .xaml is treated as binary

Posts: 4

Participants: 3

Read full topic