Brief description: check out cse491-mergez (https://github.com/ctb/cse491-mergez) and merge the fix_stddev and listcomp branches into master.
Longer description:
This code implements the calculation of standard deviation for a discrete random variable (see the Wikipedia page), with values taken from a single column text file.
Two separate improvements have been made to the codebase. Please merge them into a single branch.
Note: Be sure to take the time to look through the project and repository!
Workflow:
Clone the repository:
git clone https://github.com/ctb/cse491-mergez.git
Get all of the branches:
cd cse491-mergez
git fetch origin
Make sure you’re on master:
git checkout master
Get a list of branches, including remote ones:
git branch -r
Make a new merge branch to do the merge on:
git checkout -b try_merge
Merge in one of the two feature branches:
git merge origin/listcomp
and resolve merge conflicts, if any (see below).
Merge in the other feature branch:
git merge origin/fix_stddev
and resolve merge conflicts, if any (see below).
Go back to master.
git checkout master
Merge the ‘merge’ branch in:
git merge try_merge
(If you have time) Fork https://github.com/ctb/cse491-mergez, push your master branch to your own copy, and set up a pull request from your master to my master.
Bask in the warm glow of success.
When git merge encounters syntactically unmergeable code – where one change directly conflicts with the other branch – it will annotate the code with both versions:
<<<< HEAD
(one version of conflicting code)
====
(other version of conflicting code)
>>>> other
To clear this conflict, you need to (a) edit the code so it is syntactically and semantically correct, which means removing the <<<< etc annotations; and (b) do a ‘git add filename’ for each file you fixed, plus a ‘git commit’ to commit the changes. Then a ‘git status’ should report no conflicted files.
This file can be edited directly through the Web. Anyone can update and fix errors in this document with few clicks -- no downloads needed.
For an introduction to the documentation format please see the reST primer.