When I make a git pull --rebase, this is what I can see when I try to resolve conflicts in a json file:
version https://git-lfs.github.com/spec/v1
Updated upstream
oid sha256:daa8dd3be5413def66d9a12df3c011c6f1d2dbc459bdb4cbf2b5e5ed3fd7d752
size 612325
=======
oid sha256:6d8dfa7c7b06fa7d7c50889d111aa50bcdf12c7535222cc007012bebdda61d17
size 622401
Stashed changes
After researches, these are lfs pointers. But I can't find any solution to resolve my conflicts. I got the same thing when I make a git diff. I would like to see the content of the files, not pointers
Anyone could help me?