search

MATLAB-Community-Toolboxes-at-INCF / DeepInterpolation-MATLAB

A MATLAB implementation of the DeepInterpolation principle.
Other
6 stars 4 forks source link

Update livescripts #22

Closed mannazsci closed 1 year ago

mannazsci commented 1 year ago
vijayiyer05 commented 1 year ago

Jerome has positively reviewed the live scripts from this PR on its corresponding issue (#20).

So please proceed to merge. Exciting!

It's currently identifying there are conflicts. Please make a note about what conflicts you encounter. I guess one (and hopefully the only) may be the root folder README since it was showing a busy diff despite small changes. I've archived the current main branch version here for safety.

README.md

mannazsci commented 1 year ago

This was a bit complicated because I missed a step -- which was to merge main to livescripts before adding my new commits.

I resolved this by doing the following locally:

  1. creating a new branch ls-2
  2. merging main to ls-2 to preserve VORtech's authorship
  3. cherry-picking the recent commits from livescripts and committing to ls-2
  4. deleting the old livescripts branch
  5. checking out a new livescripts branch from ls-2
  6. force pushing this livescripts to remote

This has resolved conflicts. Will proceed to merge.