Can’t pull a Git branch because of merge conflicts?

0 min read 63 words

Sometimes you need to pull a remote branch and want to accept all their commits (and history) and override your own repository.

It’s quite simple if you do a pull, don’t care about unrelated histories and accept all their code when there’s a conflict.

git pull upstream master  --allow-unrelated-histories  -s recursive -X theirs

Then simply push to your own remote and you’re done!

Tags:
Andrew
Andrew

Andrew is a visionary software engineer and DevOps expert with a proven track record of delivering cutting-edge solutions that drive innovation at Ataiva.com. As a leader on numerous high-profile projects, Andrew brings his exceptional technical expertise and collaborative leadership skills to the table, fostering a culture of agility and excellence within the team. With a passion for architecting scalable systems, automating workflows, and empowering teams, Andrew is a sought-after authority in the field of software development and DevOps.

Tags