D
D
desperand2016-11-18 01:29:10
git
desperand, 2016-11-18 01:29:10

How can I work with .rej files (GIT) on Windows after applying the patch? Is there a GUI to work with them?

Hello. I applied a very large patch (git) from one large project, into a private forked project, several dozen .rej files appeared. The question is: are there utilities / gui for Windows to work with the generated reject hunks conveniently?
How I work now:
1. I open the .rej file
2. I look at what needs to be added, what needs to be deleted (+ before the line or minus) I look at my code
3. I add or delete this thing and rush from one editor to another.
I would like to:
1. Open the mycode.c.rej file, which will show the mycode.c file and what it would be desirable to insert where
2. Well, then work with it using a convenient editor (preferably like araxis merge style).
I don’t know how to work with .rej files, I always added lines with pluses by hand and deleted lines with minuses, but when .rej files are full after applying a major patch, I personally got tired of adding the same thing that you can it would be in the utility in 90% of cases to do it with one button, if these .rej files could be opened with the merge tool...

Answer the question

In order to leave comments, you need to log in

2 answer(s)
A
aol-nnov, 2016-11-18
@desperand

did you apply the patch through git?
git mergetool and go!
as a merzhtula - softina to your taste. i know kdiff3 and meld

N
Nikon_NLG, 2016-11-18
@Nikon_NLG

rej is the output of the regular patch command, if I'm not mistaken?
those. look for patch rej merge tool

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question