working with MQ rejected files

[0000 vk]

[...]

Each .rej file shows the parts of the diff that could not be applied
> to the file. I generally open up the .rej files in a text editor and
> manually make the changes in the .rej files. It generally isn't hard,
> though if you have a lot of conflicts, it can be quite a chore.
>

but once you made the fix in the .rej file how do you apply it back? do you
qimport the .rej file? or manually merge the changes back?


thanks.
vk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090302/00c7e696/attachment.htm