0

I have forked a repository from github. Now, I have made some changes in the file which I have forked. Now I want to merge my changes to the main repository. When I try to merge the file directly it shows me that there are conflicts in the code. How can I solve this problem?

Prinshu Kumar
  • 33
  • 1
  • 4
  • 1
    As it asks you to do - You'll have to resolve the conflicts first. – Pankaj Singhal Aug 30 '18 at 17:39
  • the body of your question is really different than your title... – Julian Aug 30 '18 at 17:45
  • 1
    `man git-rebase`, and rebase your branch. Do not attempt to merge as others are advising you, and manually resolve the conflict. Most repo owners will reject merge requests that had a conflict. This is fine for your own internal repos, but pull requests with conflicts are almost certain to be rejected. I know I would reject such a pull request. Resolve the conflict by rebasing your branch. – Sam Varshavchik Aug 30 '18 at 18:08

1 Answers1

0

If the only thing you are looking for is to resolve merge conflicts you can use something called git mergetool here.

You can get more info about mergetool here.

You can find out about resolving merge conflicts here.

Hope this helps.

Mukesh A
  • 323
  • 1
  • 4
  • 13