git add remote aur https://aur.archlinux.org/REPO_NAME.git git fetch aur git merge -X theirs --no-edit aur/master