Basic info about committing changes using the Lively GitControl
X
M
–
All Lively installations, such as you might have on localhost, or such as the lively-kernel.org/core installation, are separate instances of the master installation on Git. The GitControl tool makes it easy to update an installation and to commit changes made in that installation up to the master on Git. General commit and update workflow As a general rule, prior to making a bunch of changes, it is good to use the GitControl to do a "pull", bringing your installation up to date so that the only changes you will have to deal with be those involved in your project. Suppose you have changed a method in Widgets.js. When you open the GitControl, this file will appear as an "unstaged change", or you may have several files listed there that you have changed. You can us the "diff" button to see the changes that will be committed. [this does not work for me but it should for you. The alternative is to go tot the console window and type "git diff" or "git diff " followed by the pathname of a specific file] Maybe we need some discussion about what to do if things appear in the diff that you do not want. The simplest answer here would go to go fix the file. In preparation to commit, you need all your local changes to be either "staged" (in preparatin to commit), "stashed" (set aside from the commit but not forgotten. perhaps as you have more to do before committing), or forgotten (the X), meaning the changes will be lost, though you may still have that file around. So do one of these three things to all your unstaged changes. Now you are ready to commit your (now) staged changes, and this is done by pressing the "commit" button. Here you will be asked for a short comment about what these changes are. This will appear in the log which can be seen under the "log" tab. Next you should press "pull". This may take a little while and should then print a few lines ending with a pair of version numbers on the master. [for some reason my system asks me for my name and password at this point which can be entered in the terminal window] The final step is to do a "push" which makes your changes visible on Git, and everyone who updates will see those changes. This should also display a few lines with version numbers, and you should then be able to see your change at the top of the log window. Adding new files The file or directory that you want to add should already exist (create it. e.g. with the System Code Browser). In order to add new files to be controlled by git go into the "status" tab. Your file / directory will appear in the "Untracked files" category. Hover over the line representing the file / directory and hit the "add" button. The file / directory will now be listed as a "staged change" that can now be committed.