1

I have two branches:

  • Master
  • 1.1.0

I initiated a pull request to merge 1.1.0 with master. However, there are complex conflicts and it says to use command line to fix the conflicts. There are over 1500 conflicts. I am sure that I want to use the files in 1.1.0 to overwrite files in master. I have found something called 'ours' and 'thiers'. I understand the concept, that i have to use one of those keywords in the command line to choose which branch should keep it's changes.

I want 1.1.0 to overwrite the conflicting files in master. So could anyone please let me know what commands I should do?

Thanks in advance.

user5903386
  • 47
  • 1
  • 7
  • 1
    Possible duplicate of [What's the best way to force a merge in git?](https://stackoverflow.com/questions/9434959/whats-the-best-way-to-force-a-merge-in-git) – Roshan Br Oct 15 '18 at 11:30

1 Answers1

3

You should be able to use the following command.

$ git push --force <remote> 1.1.0:Master

Which follows the format of

$ git push <remote> <local branch name>:<remote branch to push into>

with <remote> being the remote of your repo which is typically origin.

Sources:

How do I push a local Git branch to master branch in the remote?

What's the best way to force a merge in git?

szybia
  • 105
  • 1
  • 6