gitattributes when setting up the project (I'm not completely sure if it's git LFS, Sourcetree or Bitbucket that added that).Īny ideas would be gratefully appreciated. The "OLD" and "NEW" labels on top of it all, makes it look a bit like it's trying to show the diff in the other style, but maybe it's getting confused with the "diff=lfs" setting added to. For instance looking at the same change as above, which is an unstaged change to an image, it will look like this:īut if you're looking at a change in the history, it will again just show the git lfs text diff: The closest I've come is Git Tower, which will show new changes. However, I was wondering if there isn't a better way of doing it? Maybe a git GUI client that just handles comparing images out of the box. This is quite nice, and while it's not a free tool, that's not a problem. That's pretty nice, but now we can't "External Diff" text changes any more.Īnother option is to use BeyondCompare, which can compare both text and images with the same command, and also show the "changes": For instance, we can set up TortoiseSVN's TortoiseIDiff as an external diff tool, and we can get this diff:
It's possible to set up an external diff tool, and use the "External Diff" link from Sourcetree. For instance, in Sourcetree (with Git LFS), which is what we get when looking at a modified image:
One thing we would like, is a nice way to visualise image changes. We're currently using Sourcetree as our client, though we're open to use over clients.
#Sourcetree with p4merge windows 10#
We're just starting a project (Unity based) and are using git (we've used SVN in the past) on Windows 10 and MacOS.
0 kommentar(er)
