Added the last things I did today. authored by Markus Owen's avatar Markus Owen
...@@ -211,4 +211,25 @@ remote: ...@@ -211,4 +211,25 @@ remote:
To git@gitlab.com:rootmodels/OpenSimRoot.git To git@gitlab.com:rootmodels/OpenSimRoot.git
* [new branch] osx-redirect -> osx-redirect * [new branch] osx-redirect -> osx-redirect
ppmmro02:OpenSimRoot pmzmro$ ppmmro02:OpenSimRoot pmzmro$
``` ```
\ No newline at end of file
Use the link or website to make a merge request (to merge the branch back to the master).
I can't recall now why I did the following - something to do with: "If you update your branch from the changes on the master, the branch should also run through the CI pipeline next commit. I think it is probably good to see that branches pass the tests. "
```
ppmmro02:OpenSimRoot pmzmro$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
ppmmro02:OpenSimRoot pmzmro$ git pull
remote: Counting objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (1/1), done.
From gitlab.com:rootmodels/OpenSimRoot
47e40e1..76560e6 master -> origin/master
Updating 47e40e1..76560e6
Fast-forward
OpenSimRoot/tests/engine/testEngine.sh | 12 ++++++------
```
OpenSimRoot/tests/modules/testModules.sh | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
\ No newline at end of file