search

rasbt / pattern_classification

A collection of tutorials and examples for solving and understanding machine learning and pattern classification tasks
GNU General Public License v3.0
4.15k stars 1.29k forks source link

def bagging #14

Closed vmirly closed 10 years ago

vmirly commented 10 years ago

How should we resolve these merge conflicts?!!

vmirly commented 10 years ago

git merge upstream/master error: 'merge' is not possible because you have unmerged files. hint: Fix them up in the work tree, hint: and then use 'git add/rm ' as hint: appropriate to mark resolution and make a commit, hint: or use 'git commit -a'. fatal: Exiting because of an unresolved conflict

rasbt commented 10 years ago

I dunno, somehow it got a little bit confused after I didn't add the kernel trick.

Maybe try to pull the updates from my repos once in a while:

You have to add my repo as a remote $ cd yourdir/pattern_classification $ git remote add upstream git://github.com/rasbt/pattern_classification.git

And then you can pull from it via: $ git pull upstream

But first, let's start over. I think it's best if you just copy&paste the whole contents from the most recent version into your version. You can copy it from here: https://raw.githubusercontent.com/rasbt/pattern_classification/master/resources/data_glossary.md