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
The reason will be displayed to describe this comment to others. Learn more.
I recommend that you just reset your branch to current trunk and manually port your state-tracking over. This manual import of the new files is going to cause an almighty merge conflict.
The reason will be displayed to describe this comment to others. Learn more.
I recommend that you just reset your branch to current trunk and manually port your state-tracking over. This manual import of the new files is going to cause an almighty merge conflict.
Thanks! Yes it is actually what I did (cf. previous commit) but I inadvertently deleted mat.py over the course of reporting my state-tracking changes. So this commit just restitutes this lost file from master.
520078b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recommend that you just reset your branch to current trunk and manually port your state-tracking over. This manual import of the new files is going to cause an almighty merge conflict.
520078b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Yes it is actually what I did (cf. previous commit) but I inadvertently deleted
mat.py
over the course of reporting my state-tracking changes. So this commit just restitutes this lost file from master.