# check files that have differences
git diff --name-only <branch_to_merge_into> <branch_to_merge_from>
# checkout the branch you want to merge into
git checkout <branch_to_merge_into>
# checkout the file from the branch you want to merge from
git checkout <branch_to_merge_from> -- <file>
# unstage that file to be able to use difftool (optional in notebooks)
git reset HEAD <file>
# use difftool to chose which lines to keep. Click on the mergebutton in difftool
git difftool
#Save the file in difftool and commit.