merge git and svn versions

Synchronized with latest gdat svn, ran the default script test_script.sh matlab850 all passed So can merge back

Very good, when !6 (merged) completes please merge master into your branch and re-push to this branch to update your merge request with the working test.

git checkout <branch>
git fetch
git pull
git merge origin/master
git push
OR substitute last two with:
git rebase origin/master
git push -f
(to keep linear history)

Or try clicking the 'rebase' button and see what happens!!

added 3 commits

• 7b81044c...882952fd - 2 commits from branch master
• 58efc888 - merge git and svn versions

Compare with previous version

merged

mentioned in commit fb2839df

very good so who is supposed to close this branch since I created it, you merge and I close so we are sure we all see what is needed?

Usually the merge requester (you) selects whether the branch should be deleted (on the merge request page). In this case I assumed you did not really know about this so I selected it before the merge. If I was not sure I would have asked.

ok fine, yes I did not click since I thought we said we first do the merge, see if all ok then delete, but indeed we might forget to delete and I guess it's deleted only if merge is successful...

Indeed if it is not ok it does not let you merge so it will not delete.