3 ms·
Until recently, change ids were entirely local (in the git backend). So conflicts just can’t happen. Recently jj started including the change id in a header in
by steveklabnik 1y ago
Until recently, change ids were entirely local (in the git backend). So conflicts just can’t happen.
Recently jj started including the change id in a header in the git object, so the receiving side can choose to respect/expose them as appropriate. An issue with this is that some git commands don’t guarantee the preservation of headers, so it’s possible to accidentally lose them; git rebase being a prime example.