upgrade on matlab-demo-en.tm

[Matthias-A-Steiner]

I've fixed some inconsistencies and added some further clarifications
Tilda A. Steiner

[mgubi]

Looks fine to me. @sadhen what do you think?

[da-liii]

Look good to me too. @mgubi could you help commit it to SVN?

[da-liii]

And here is how I sync the code from https://github.com/texmacs/texmacs:

https://github.com/texmacs/git-migration#another-way-to-prepare-a-plugin-repo

[Matthias-A-Steiner]

Dear Darcy,
I noticed that my pull request has not been fully accepted yet. Is this because your are still waiting for s.th. from me?

Yours
Tilda A. Steiner

[mgubi]

I think @sadhen is waiting for me to commit it. Sorry for the delay. I will try to do it soon. I think the PR is complete.

[mgubi]

I see that now the branch has one conflict. @Matthias-A-Steiner can you resolve it? I will try to close this PR soon.

[Matthias-A-Steiner]

Dear mgubi,
how do I resolve the conflict?

[mgubi]

I think it is enough to put your local repo in sync with texmacs/master to manifest there the conflict, resolve it, and then push to your remote branch Matthias-A-Steiner/matlab . This should automatically update the PR.

[Matthias-A-Steiner]

Dear mgubi,
I'm a bit confused. The file doc/matlab-demo.en.tm has already been uploaded. Of course it conflicts with the previous upload as I added corrections and minor improvements. And how do I sync my local repo with the remote branch

[pireddag]

@Matthias-A-Steiner Please take a look at the Readme file of https://github.com/texmacs/notes, last few lines, on how to update your local branch.

The matlab-demo is marked as a conflict (by logic, I did not check) because it has been changed both in the repository and in the branch which you are making the pull request from.
It makes sense to take a look at the changes in the repository and see if you want to integrate any into your version.