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
Now I did an interactive rebase where I swapped the order of the commits. This ought to work with daff, I believe? And indeed the rebase succeeded without conflicts and the final CSV was correct!
I created a csv file, made some changes, added the
.gitattributes
and config as proposed bydaff git
:Now I did two changes in two different cells which ought to be compatible:
Now I did an interactive rebase where I swapped the order of the commits. This ought to work with
daff
, I believe? And indeed the rebase succeeded without conflicts and the final CSV was correct!But the commit history is now messed up:
In the penultimate commit, the cells swapped place!
The text was updated successfully, but these errors were encountered: