git remote add upstream https://gitlab.archlinux.org/archlinux/packaging/packages/linux.git git fetch upstream git merge -X theirs --no-edit upstream/main