bump-merge | Binary bump-merge driver for Git

bump-merge is a Shell library. bump-merge has no bugs, it has no vulnerabilities and it has low support. You can download it from GitHub.

Bump-merge is a custom merge driver for Git to simplify workflows that deal with binary files. When you can't diff a file and choose between the different text options from each, you may be faced with choosing one file or the other. However, it is usually not that easy. Maybe two people made edits to a file on different branches or different machines and resolving the conflict requires opening both files and copying changes from one into the other. These could be schematic capture files, PCB layouts, text-based config files of an unknown format, images, etc. Stashing files doesn't help; because, when you pop the stash, it still requires a merge. You can't save only the server version, nor can you save only the local version. So, you may start copying files out of your local directory and cleaning up the working copy to access both versions of the file on your local machine. Bump-merge solves that problem for you. When you pull from a remote, and there are file conflicts in your local repository, bump-merge copies your local copy to a subdirectory called local_version and places the remote version in your working directory. Git is happy that the merge succeeded, and you have access to both files to resolve the conflict in the appropriate editor. Just open both versions, copy changes from the local version into the working copy and add, commit, and push.