*.dxf filter=lfs diff=lfs merge=lfs -text binary *.dae filter=lfs diff=lfs merge=lfs -text binary *.collada filter=lfs diff=lfs merge=lfs -text binary *.c4d filter=lfs diff=lfs merge=lfs -text binary *.blend filter=lfs diff=lfs merge=lfs -text binary *.3ds filter=lfs diff=lfs merge=lfs -text binary *.3dm filter=lfs diff=lfs merge=lfs -text binary *.playable filter=lfs diff=lfs merge=lfs -text binary *.flare filter=lfs diff=lfs merge=lfs -text binary *.sbsar filter=lfs diff=lfs merge=lfs -text binary *.controller filter=lfs diff=lfs merge=lfs -text binary *.meta filter=lfs diff=lfs merge=lfs -text binary *.asset filter=lfs diff=lfs merge=lfs -text binary *.physicMaterial filter=lfs diff=lfs merge=lfs -text binary *.physicMaterial2D filter=lfs diff=lfs merge=lfs -text binary *.prefab filter=lfs diff=lfs merge=lfs -text binary *.unity filter=lfs diff=lfs merge=lfs -text binary *.anim filter=lfs diff=lfs merge=lfs -text binary *.mat filter=lfs diff=lfs merge=lfs -text binary *.unitypackage filter=lfs diff=lfs merge=lfs -text binary *.cubemap filter=lfs diff=lfs merge=lfs -text binary I imagine the challenge probably falls more in line with determining if the file is in fact an LFS file and not just a txt file, but again I'll let the experts provide more light on the situation / what the challenges and potential solutions are in implementing this feature.

Based on my understanding of git LFS, they look like they should work, but git commands are not my expertise. In regards to the actual git commands being invoked I'm not sure. If anyone gets the chance to implement these features let me know and I'd love to try them out / provide feedback. Normally we do good about not having that many merge conflicts to worry about, but every once and a while when upgrading to a newer version of our game engine Unity, things don't go as smoothly and we need that 'Choose All Mine' or 'Choose all Their's' option. A 'Choose All Mine' or 'Choose All Theirs' option would also be helpful to just act on all of the merge conflicts. A 'Choose Mine' or 'Choose Theirs' solution. Currently our artists have to open a command prompt and enter git mergetool and take the merges by hand.Īgain thanks for looking into this for us Yes that is what we are looking for in regards to our LFS merge conflicts via a GUI. However, we don't even get the option as seen in the expected image. This would be much more intuitive for our artists. The during merge screen would be nice if there were 'Accept Incoming Change' or 'Keep My Change' buttons. Pic was taken with a normal merge conflict (not LFS). What we expect to see before committing merge. Here are some example pics of what we see: We simply want to be able to do an 'Accept Incoming Change' or 'Accept Current Change' from GitHub Desktop like we currently have to do in VS Code. I realize all we have to do is pick the merge ourselves in a merge tool / text editor and is plenty easy for us developers to do, but this is not intuitive for our artists (we are a game dev team).

Git lfs github desktop