Why donate?
- Tutorials, follow the NBT course
Follow us
The NBT code is under version control. EEGlab and Fieldtrip use the CVS system (see the CVS repository for EEGlab). NBT use the Bazaar system because this is a more modern so-called distributed version control system.
The basis of version control is simple. All code is kept centrally at a server, and a folder at each users computer. If a user makes a change to the code; he/she does it locally on his/her computer, and then later uploads (“Commits”) the changes to the server. When the changes are uploaded, other users can download the changes (“Update”) to their computer.
Sometimes a conflict happens, e.g., when two users have made changes to the same line in the same file. The Bazaar program automatically identifies such conflicts and has tools to solve (“Merge”) these conflicts.
It should only take a few minutes to begin. You only need to do the following once.
Before making any changes to the code, make an “update” of your local copy. When done with your changes make a “Commit”.
The update procedure will update your local copy with new changes.
The commit procedure will commit changes in your local copy to the server.
A “Conflict” emerges if two users change the same file at the same time.
The aim of version control is keep the code consistent, and any conflict should therefore be solved. Bazaar simply does not allow you to upload new changes if they are in conflict with the server version.
You probably got a : “bzr: ERROR: These branches have diverged.” error message. This means that you need to merge your local copy with the server copy.