search

the-carlisle-group / Acre-Desktop

A simple Dyalog APL IDE plugin that introduces "projects" and allows you to keep your source code in Unicode text files.
MIT License
11 stars 1 forks source link

System vars in subspaces for NEW projects #205

Closed PaulMansour closed 4 years ago

PaulMansour commented 4 years ago

When new projects are created quadVars must be created in any space sub space where namespace scope system vars differ from their parent. For example if ⎕IO is 1 in the root of the project, but 0 in a subspace, then quadVars must also be specified in the subspace. . This is only an issue on creating a project.

PhilLast commented 4 years ago

Done this in a branch "quadvars" which I've just "rebased". So I have one change that's not in "master".

It works.

Now what do I do?

PhilLast commented 4 years ago

Actually no uncommitted "changes". Just one "commit".

PaulMansour commented 4 years ago

Now you want to merge to the master. This should be a fast-forward merge, which means that no conflict is possible.

PaulMansour commented 4 years ago

While on the master branch do from git command line:

merge --ff-only quadvars

If that works you can then delete the branch