Rebase with GitLens

A merge conflict happens when Git encounters competing changes that it cannot automatically resolve. This is somewhat recurrent. It can…