We all have the type of colleague who is not afraid to create a branch, make a change, and then forget about it for months. When you finally come back to review the branch, the SQL schema has already changed and the code is no longer compatible.
“A Database Error Occurred”
Forget about changing your local SQL scheme. Instead, use git’s feature called –no-commit while fake-merging the old branch into your current branch.
This way, you have a high chance to test the old branch on your current SQL scheme and then discarding the merge.
Command line:
git merge --no-commit old-branch
Lazygit (my current favorite tool):
Sublime Merge (I still use it to view large diffs):
