search

CDAT / Jupyter-notebooks

1 stars 0 forks source link

Issue13 #32

Closed dnadeau4 closed 5 years ago

dnadeau4 commented 5 years ago

Tanya found out that we missed this file somehow when we merged. It was a new one she created from issue#13.

dnadeau4 commented 5 years ago

I have restored dosctanya just in case we find more. It most have been deleted when we add and move genutil/cdutil

dnadeau4 commented 5 years ago

There is only 1 file changed right?

davis278 commented 5 years ago

One of the commits in this pull request, 9f01880, says 520 files have been changed. I've attached the screenshot of that commit. I'm thinking that the 9f01880 commit (use file from master) is when you restored the dosctanya branch (to get the one file that we need to add), but it is restoring all the files from that branch which means your subsequent edits (of which there are many) will be lost - assuming I'm understanding things correctly.

Screen Shot 2019-06-28 at 10 28 21 AM

dnadeau4 commented 5 years ago

@davis278 and I merge master into issue13 https://github.com/CDAT/Jupyter-notebooks/pull/32/commits/d73b11fd2c302f38e6eeda98a1e7013ab76f02c1 which means that https://github.com/CDAT/Jupyter-notebooks/commit/9f01880595ce5245926f6f62b43de46be1fc16b was already in master logs and only 1 file was changed after that. That is what github.com is telling you at the top.

I just try the "command line instructions" and do a git diff master after step 1 and saw that only 1 file has been changed. It is the last commit that counts

davis278 commented 5 years ago

@dnadeau4 thanks for the clarification. I've followed the command line steps and can see that only one file has changed. I'll approve the pull request.