You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I think it would be better to provide a option that saves conflict contents to a new .rej file. Then I can resolve them manually as there won't be too many conflicts after wiggling.
The text was updated successfully, but these errors were encountered:
I might make sense to add such an option, and it should be fairly easy to do.
However I have no interest in working on it at the moment. If you would like to try writing some code, I would be happy to review any patch you produce, or to provide suggestions if you cannot see how to get started.
I think it would be better to provide a option that saves conflict contents to a new
.rej
file. Then I can resolve them manually as there won't be too many conflicts after wiggling.The text was updated successfully, but these errors were encountered: