I cannot build anymore and many of my changes seem to have gone this
month.  I suspect it is something to do with the typesystem branch but
¬I am very confused.  In particular insert.c and csound_orc_compile.c
do not merge.

How do I recover?  It is all OK on my other machine.
==John ffitch

> Hi John,
>
> Sounds like you are wanting to switch back to the master branch?  You can
> check what branch you are on by using "git branch".  For example, I have:
>
> Steven-Yis-MacBook-Pro:csound6 stevenyi$ git branch
>   master
> * typesystem
>
> showing I'm on the typesystem branch. I can switch back to master using
> "git checkout master".
>
> steven
>

That is what I cannot do!  It complains agbout merge failure in insert.c
and csound_orc_compile.c

Should I just delete these?

I tried changing to typesystem but it failed to build, so I tried to back
off -- without and success

xenakis:~/Sourceforge/csound/csound6 277> git branch
* master
  typesystem
xenakis:~/Sourceforge/csound/csound6 278> git checkout master
Engine/csound_orc_compile.c: needs merge
Engine/insert.c: needs merge
error: you need to resolve your current index first





------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net