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
if you rename them now, and git pull you will get intact copies of my notebooks 3 and 4
the existing notebooks 3 and 4 have conflict markers in them, indicating where your notebooks differ from mine
if you open then in a text editor, look for lines that begin with <<<<, ====, >>>> and you can get rid of those...or use a mergetool which is git's way of allowing you to resolve conflicts