How to Resolve Git merge conflicts during a pull?

Sat, 06/18/2022 - 06:39

 To resolve all conflicts with below simple steps.

git fetch && git reset --hard origin/master

git pull -X theirs

git pull origin master
Tags
Git
  • 55 views

Add new comment

About text formats

Restricted HTML

  • Allowed HTML tags: <a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id>
  • Lines and paragraphs break automatically.
  • Web page addresses and email addresses turn into links automatically.
4 + 2 =
Solve this simple math problem and enter the result. E.g. for 1+3, enter 4.

Instagram Without API

Could not reach Instagram server