@glugeorge this is the PR I was having trouble with. There were conflicts that were too complex to deal with in the web editor and I wasnt having any luck with the two options of how to deal with this (using the command line or using the github desktop app).
I managed to use Github Desktop in the end. Initially I tried to do this by clicking on the option that showed up in in this conversation, but that just seemed to open githubdesktop app and checkout the master branch and not do anything else. But then I found that I could go to ehc-add-orientation-coord branch in the app, go to Branch dropdown menu and choose 'Merge into current branch', choose the master branch from the dialog box that popped up, then click 'Create merge commit' Then it gave me the option to choose what version of each file to use (the one from Master or the one from ehc-add-orientation-coord. As the only conflicted files were the NBs, I just chose to take the ones from Master.
This is all very confusing, but I think. as long as we each just stick to working on our own branches, we should be ok
@glugeorge this is the PR I was having trouble with. There were conflicts that were too complex to deal with in the web editor and I wasnt having any luck with the two options of how to deal with this (using the command line or using the github desktop app).
I managed to use Github Desktop in the end. Initially I tried to do this by clicking on the option that showed up in in this conversation, but that just seemed to open githubdesktop app and checkout the master branch and not do anything else. But then I found that I could go to ehc-add-orientation-coord branch in the app, go to Branch dropdown menu and choose 'Merge into current branch', choose the master branch from the dialog box that popped up, then click 'Create merge commit' Then it gave me the option to choose what version of each file to use (the one from Master or the one from ehc-add-orientation-coord. As the only conflicted files were the NBs, I just chose to take the ones from Master.
This is all very confusing, but I think. as long as we each just stick to working on our own branches, we should be ok
cc @Elizabethcase