# pull-main > Pull main branch and handle merge conflicts - Author: Richard Gill - Repository: richardgill/nix - Version: 20260121085018 - Stars: 29 - Forks: 0 - Last Updated: 2026-02-06 - Source: https://github.com/richardgill/nix - Web: https://mule.run/skillshub/@@richardgill/nix~pull-main:20260121085018 --- --- name: pull-main description: Pull main branch and handle merge conflicts --- `git pull origin main --ff` and then handle any merge conflicts