What are .rej files created during merge?

Question

I merged the main branch into a new branch, some .rej files are created.

I took the lead branch pool to a new branch. I am having conflicts that I have resolved, but there are some .rej files.

Could you help me find out about .rej files and what I should do with these files.

+8

git branching-and-merging

Gajanan chalke Jan 4 '16 at 6:35

source share

1 answer

Codewizard · Accepted Answer · 2016-01-04T06:52:15+0000

.rej files are rejected files (usually hacks, but not only).

When you receive these files after merging, you will have to manually edit them, fix them, and then apply them back.

You can read more about it here and what it is.

.rej file

 diff a.txt (rejected hunks) ....

Fix it manually, and then apply the .rej files as a regular patch.

manually merge the change from *.rej to the required file and delete the *.rej file.

Another useful article on this subject can be found here .