3 ms·

I've been hesitant to recommend that because I don't know how git handles image changes. If you don't mind me asking, how do your designers handle rebasing and

• eindiran 7y ago
  You should just use the same tricks for images that you would use for binary files. Instead of doing a diff, and merging the bits and pieces of conflicting files, you want to select the version from the two branches that you want. In a merge, select the desired version (eg `git checkout --theirs -- logo.png` for the version from the branch you're merging into the current branch or `git checkout --ours -- logo.png` for the version from the current branch), then add the file and complete a normal merge commit. git merge foo git checkout --theirs -- logo.png git add logo.png git commit -m "Merging foo into master" See here for some more info: https://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files https://stackoverflow.com/questions/278081/resolving-a-git-c...