Meeting minutes - AlexCrocker/TOPSCADA911 GitHub Wiki

20131021

cloned modified commit push crocker pulled and had changes.

To create a new branch select branches > new branch. Publish new branch publishes new branch locally make changes to a file in the new branch then commit locally within that branch push new branch

to pull another branch from remote repo create a new branch and select the remote upstream branch you would like to pull. Checking out the branch and pulling the branch fetches the latest commit of that branch.

We can incorporate changes from a source branch into a target branch by merging. A conflict will arise if the source and target have differences on the same line of the same file. We can resolve these conflicts by either taking the target or the source.