Skip to main content
AI Assist is now on Stack Overflow. Start a chat to get instant answers from across the network. Sign up to save and share your chats.

Return to Question

Fixed up question.
Source Link
user456814
user456814

git pull Resolve conflicts using remote changes when pulling from Git remote.. can I force it to overwrite rather than report conflicts?

I'm trying to pull code from my githubGitHub repo onto my server, but the pull keeps failing because of merge conflicts. I don't want to keep any of the changes that may have occurred on my local server since the last pull so.

So is there a way I can force gitGit to overwrite with whatever version is in githubGitHub, rather than bother me about conflicts?

git pull from remote.. can I force it to overwrite rather than report conflicts?

I'm trying to pull code from my github onto my server but the pull keeps failing because of merge conflicts. I don't want to keep any of the changes that may have occurred on my local server since the last pull so is there a way I can force git to overwrite with whatever version is in github rather than bother me about conflicts?

Resolve conflicts using remote changes when pulling from Git remote

I'm trying to pull code from my GitHub repo onto my server, but the pull keeps failing because of merge conflicts. I don't want to keep any of the changes that may have occurred on my local server since the last pull.

So is there a way I can force Git to overwrite with whatever version is in GitHub, rather than bother me about conflicts?

Source Link
David Tuite
David Tuite
  • 22.8k
  • 25
  • 115
  • 179

git pull from remote.. can I force it to overwrite rather than report conflicts?

I'm trying to pull code from my github onto my server but the pull keeps failing because of merge conflicts. I don't want to keep any of the changes that may have occurred on my local server since the last pull so is there a way I can force git to overwrite with whatever version is in github rather than bother me about conflicts?