search

MatthewPeterKelly / FluenceMapping

Trajectory optimization to match fluence profiles.
4 stars 4 forks source link

Concept introduction #10

Closed koosvanamerongen closed 7 years ago

koosvanamerongen commented 7 years ago

Started writing down an intro section and removed the minibixel exposure figure, which is irrelevant.

koosvanamerongen commented 7 years ago

Matthew, I've been looking into the history (quite handy) and found the pull request that contained my introduction concept. Seems like you've closed the request on 01/07 without merging it in. Not sure if that was on purpose. If not, could you restore the request and accept it. Otherwise, I'm curious why :)

MatthewPeterKelly commented 7 years ago

I think that I just made a mistake and closed it instead of merging. It is probably going to not be an easy thing to merge back in. My vote would be that you check out the dead branch, and then copy-paste you updates to the intro somewhere outside of git. Then checkout a new branch off of master and then copy-paste the edits back where they are supposed to go, careful not to delete any of the new changes. Then make a new pull request on the newer branch from master. There are lots of other ways to do this as well.

Sorry for the confusion!

koosvanamerongen commented 7 years ago

No problem. I recovered the old intro and have sent out a new pull request. Nothing changed to the intro in the meantime. The intro doesn't fit in perfectly anymore, but I'll leave it this way until David has restructured the doc.

MatthewPeterKelly commented 7 years ago

Great - thanks!