Resolving merge conflicts with lapis.sql

less than a minute

Resolving a merge conflict with a large auto-generated file like lapis.sql can be a pain because tools like GitLab and VSCode can’t load them due to their size. The following Git commands allow you to “skip” specific files from a commit.

Rebasing a branch onto develop causing a merge conflict

This example assumes you are currently rebasing on top of develop, hence the ours commit refers to the commit coming from develop, and the theirs commit refers to your local commit, for more info, see the git-checkout documentation.

git checkout --ours tests/_data/lapis.sql
git add tests/_data/lapis.sql
git rebase --continue