The Remote Repository Setup Assistant can be reached through menu Preferences / Remote repository. See Collaboration for information about what this repository is used for. Use remote repositoryThis setting allows several people to work together on one project. Several other settings have to be made, as described below. Trying out the content trackerThe setup assistant will test the content tracker, whether it is able to perform everything that is needed. Normally the test passes, and you can go forward. Action selectorIn the next page select which action you'd like to take. For a first repository setup, the default action should be chosen. RepositoryThis is the URL of the repository that Bibledit is going to use. Your system administrator should give you the URL that ought to be filled in here. Example URLs: git://biblerepository.com/projects/myproject git://localhost/repository file:///home/joe/repositories/myproject The path should point to an already existing repository, created by the system administrator. If the repository has been set, the dialog will indicate whether read access to the repository has been granted. Clone repositoryPress the button to clone the remote repository. Write accessIf write access has been granted, then things should work fine. Push to repositoryNormally this step will be skipped. But if you really like your data to be pushed into the repository, or if the repository is still empty, then press the button to push your data to the repository. Use with care because it wipes out anything in the repository, and replaces it with your data. Conflict handlingWhen two users make changes in one line in one verse, and the changes are not compatible, then a conflict will occur. Bibledit will resolve this conflict for you. Settings for that are made in this dialog. You can give preference to "the local data". This means that the data of the other user is lost. Or you can give preference to "the data in the remote repository". This means that your own changes will be overwritten with the changes that are on the server, which actually means that the changes the other user made overwrite your own changes. When two users make changes in different verses of the same chapter, at the same time, Bibledit will merge those changes. Applying the changesKeep pressing the "Forward" button and at the end "Apply" the settings. |