Page Comparison

...

commit messages should clearly describe changes and the version of the repository should be amended accordingly.

Resolving Conflicts

Urghh we don’t do conflict unless it is putting cavaliers in their place with walls of musket fire.

Maintaining a Repository

Using Multiple Deploy Keys

One way to pull code from Git to a server is to add a public SSH key as a Deploy Key in the Repo Settings. There is a problem though that each Deploy Key can only be used on one GitHub repo which requires multiple Keys. You then have the problem of telling Git which key to use with which repo.

1. Generate an SSH keypair per repo as usual (albeit with a unique filename) and add it to the repo as a Deploy Key.

2. Create a .ssh/config file which looks similar to the following -

Host github.com
        Hostname github.com
        IdentityFile=/home/ukrdc/.ssh/bamboo
Host github.com-data_extract
        Hostname github.com
        IdentityFile=/home/ukrdc/.ssh/data_extract_key
Host github.com-ukrdc_database
        Hostname github.com
        IdentityFile=/home/ukrdc/.ssh/ukrdc_database_key
Host github.com-ukrr_quarterly_extract
        Hostname github.com
        IdentityFile=/home/ukrdc/.ssh/ukrr_quarterly_extract_key

Useful reference Articles/Sites

...