Stone-Soup icon indicating copy to clipboard operation
Stone-Soup copied to clipboard

Add initial version External Interface documentation.

Open DaveKirkland opened this issue 6 years ago • 5 comments

This is a really basic version. More specifics will have to be added later.

DaveKirkland avatar Jan 22 '19 20:01 DaveKirkland

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 avatar Jan 28 '19 15:01 DaveKirkland

@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 avatar Jan 28 '19 15:01 sdhiscocks

@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 avatar Jan 28 '19 18:01 DaveKirkland

@DaveKirkland You can remove the merge commit with git reset --hard HEAD^ then rebase.

sdhiscocks avatar Jan 29 '19 08:01 sdhiscocks

@DaveKirkland You can remove the merge commit with git reset --hard HEAD^ then rebase.

Done. I've pushed the update to the remote.

DaveKirkland avatar Jan 29 '19 13:01 DaveKirkland

Closing this for now, until we have a more concrete example, such can document better.

sdhiscocks avatar Feb 21 '23 09:02 sdhiscocks