-
|
Is it possible to override the conflict-check for I realize that in general this isn't a good idea and that it can cause headaches for other devs who pull the branch, but in some cases I just want to be able to have the conflicted state available on a particular remote anyway. |
Beta Was this translation helpful? Give feedback.
Replies: 1 comment
-
|
Not currently. This shouldn't be very hard to implement, though you'll need to double-check and test that Update: In fact, there is already an issue for this: #1477. Though, a lot of the information in that issue is out of date. Now, implementing this should be easier than it was when the issue was originally created. |
Beta Was this translation helpful? Give feedback.
Not currently.
This shouldn't be very hard to implement, though you'll need to double-check and test that
jj git fetchwill import the conflicted commits correctly. AFAIU, all the required information is in the commit tree.Update: In fact, there is already an issue for this: #1477. Though, a lot of the information in that issue is out of date. Now, implementing this should be easier than it was when the issue was originally created.