Conversation
|
Hey, I merged the other changes from #114 . Can you please pull the latest changes into your branch, resolve the conflicts and commit again? Thank you! |
|
I believe I have resolved the conflicts. My apologies for the delay, my research group had some communication mix ups. Thank you! |
|
Hey @brookemaeda , thanks for the reply. However it looks like your merge request is broken. In the diff I see only one empty file now: https://github.com/ayeks/SGX-hardware/pull/112/files Could you please just create a new fork from the current master branch, make your changes and push it again? We can then merge the new fresh branch and can close this somehow broken pull request here. |
|
I'm sorry, I forked from the current master branch and compared them to my original fork and it seems that the files are all the same. So it appears on my end that all my changes are already in the master branch. Not sure what happened. Thank you! |
Hi Lars,
I'm one of Professor Nelson's students and have made a few changes:
New features:
Example output: