search

VirtualPhotonics / VTS

Virtual Tissue Simulator
https://virtualphotonics.org
Other
34 stars 9 forks source link

Ch 190302 tissue inclusion diff n closes #17 #78

Closed hayakawa16 closed 1 year ago

hayakawa16 commented 1 year ago

Not ready for review yet so created a "draft" PR. I will mark ready for review when complete.

hayakawa16 commented 1 year ago

Hi lmalenfant, thanks for your comments, I will look into. Have been cleaning up code that hasn't been committed yet so I will add these to check. Please wait to continue until I push this commit, unless you see blatant errors like these.

hayakawa16 commented 1 year ago

I'm ready for review. I'm sorry for so many file updates in one go.

hayakawa16 commented 1 year ago

GitHub noted that this branch is out-of-date with base branch. I just merged master into this branch. I did it using SourceTree but see there there is a nice button to do it here. Might try that next time.

dcuccia commented 1 year ago

FWIW I use the built-in Visual Studio Git tools to do all my branch merging - that way, if there's a conflict, I can address it before pushing to the repo. They have nice diff capabilities built-in now, too. image

More info here: https://learn.microsoft.com/en-us/visualstudio/version-control/git-manage-repository?view=vs-2022