Stone-Soup
Stone-Soup copied to clipboard
Add initial version External Interface documentation.
This is a really basic version. More specifics will have to be added later.
Circleci complains about some aspects of the Singer model. I merged the branch with the master and pushed it. Hopefully it resolves those problems.
@DaveKirkland Instead of merge, could you just rebase onto master
please. If you do an interactive rebase, you can drop your merge commit.
Don't worry about tests which fail that are unrelated to your code, as they'll be "fixed" once merge into master.
@DaveKirkland Instead of merge, could you just rebase onto
master
please. If you do an interactive rebase, you can drop your merge commit.Don't worry about tests which fail that are unrelated to your code, as they'll be "fixed" once merge into master. @sdhiscocks I'm not sure how to do this in git - there's another commit between my merge and my original commit. I've tried rebase -i HEAD~2 and rebase -i HEAD~2, but it says "HEAD~2: skipped because nonexistent." I get the same message when I try HEAD~3. How do you want me to proceed?
@DaveKirkland You can remove the merge commit with git reset --hard HEAD^
then rebase.
@DaveKirkland You can remove the merge commit with
git reset --hard HEAD^
then rebase.
Done. I've pushed the update to the remote.
Closing this for now, until we have a more concrete example, such can document better.