2

While applying patch in git, I am getting the below error if I have same files modified in working copy which were there in patch.

One or more hunks were rejected in the patch you just applied, you will find the hunk in '.rej' files of the same name as the file affected. The files affected are : D D..

How to fix this issue?

Surendra Reddy
  • 219
  • 3
  • 10

1 Answers1

1

You can confirm the contens of rejected hunk in '.rej' files.

you can run git difftool to launch a diff tool to view the difference side by side, and determine how to apply those patch.

Update:

For how to read .rej file, you can refer to this question on SO

For how to use git difftool ,you can refer to this page

Community
  • 1
  • 1
gzh
  • 3,507
  • 2
  • 19
  • 23