Git Image Merge Conflict Tool
You probably won't ever need to create dozens of git repositories that have conflicted image files to diff and resolve, (WINK), but if you ever do, I got you covered:
#!/bin/shSCRIPTNAME=$(basename $0)CURRENT_DIR=$(cd $(dirname $0);pwd)REPO_PATH="$CURRENT_DIR/image-merge-conflict-test-repo"if [ -d "$REPO_PATH" ]; thenrm -fr "$REPO_PATH"fimkdir -p "$REPO_PATH" || exit 1cd "\$REPO_PATH" || exit 1# Init repositorygit init .cat > .gitignore.DS_StoreEOFgit add .git commit -m "Initial commit"# Commit base image versioncurl http://lorempixel.com/400/200/abstract/base/ -o image.jpggit add .git commit -m "Base version of image"# Create another branch from this revisiongit branch develop# Commit modified image version on master/bin/rm -f image.jpgsleep 2 && curl http://lorempixel.com/400/200/abstract/master/ -o image.jpggit add .git commit -m "Modified image on master"# Commit another modified image version on developgit checkout develop/bin/rm -f image.jpgsleep 2 && curl http://lorempixel.com/400/200/abstract/develop/ -o image.jpggit add .git commit -m "Modified image on develop"# Create merge conflict stategit checkout mastergit merge developexit 0
PreviousKaleidoscope 2 Is Here