Version 2 (modified by, 12 years ago) (diff)


This is a draft !!||

Sample Repository

The Bcfg2 example repository is located at:

Beside the described ways in the README to use the Bcfg2 repository is one available that needs more configuration.

Bring your Bcfg2 repository under control of git

Switch to the Bcfg2 repository folder and initialize the git repository.

cd /var/lib/bcfg2
git init

Now there is a new folder named .git in your Bcfg2 repository. Identify yourself to git. For more details please refer to the Bcfg2 Git Howto page.

$ git config "Your name"
$ git config "[email protected]"

Everything needs to be added to git and committed.

git add . && git commit -a -m "Initial commit of the Bcfg2 repository"

With git log can you check if your first commit was successful. Now it's time to pull in the data from the remote repository at github. First add a shortcut.

git remote add upstream

Then the data can be pulled.

git pull remote master

As you can see in the console output, there is a conflict because in the sample files xi:include is used.

warning: no common commits
remote: Counting objects: 24, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 24 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (24/24), done.
* branch            master     -> FETCH_HEAD
Auto-merging Metadata/clients.xml
CONFLICT (add/add): Merge conflict in Metadata/clients.xml
Auto-merging Metadata/groups.xml
CONFLICT (add/add): Merge conflict in Metadata/groups.xml
Automatic merge failed; fix conflicts and then commit the result.

Fix the conflict and recommit.