Try using git difftool to resolves merges; this pops up a three-paned
window in something like vimdiff with the old on the left, the new on the
right, and merge in the middle, with the conflicts highlighted. Very handy!


On Wed, Feb 26, 2014 at 7:58 PM, LSheneman <notifications@github.com> wrote:

> In mrnaseq/1-quality.txt:
>
> > @@ -248,13 +250,15 @@ quality score encodings.
> >  Automating this step
> >  ~~~~~~~~~~~~~~~~~~~~
> >
> > -This step can be automated with a 'for' loop at the shell prompt.  Try::
> > +<<<<<<< HEAD
>
> again thanks, I keep getting these and am trying to figure out how to
> avoid them showing their dirty little faces...
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/ged-lab/khmer-protocols/pull/67/files#r10107912>
> .
>



-- 
Camille Scott

Department of Computer Science and Engineering
Lab for Genomics, Evolution, and Development
Michigan State University

camille.scott.w@gmail.com