> 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

The unmerged files contain markers for unmerged code:

<<<<<<< HEAD
code in the HEAD of the master
=======
code in the typesystem branch
>>>>>>> typesystem

Example, I have a master with a text file called `test.txt' and a
branch called `new'. I have different commits in `master' and
`new' so, during the merge, there is some conflict.

test.txt in the master is

one
two

and test.txt in the `new' branch is

one
2

with different commits. After the merge in the master, test.txt is

one
<<<<<<< HEAD
two
=======
2
>>>>>>> new

I open the file with the editor and use the better code, removing the markers.

one
222

Done. `git add .' and editing of the other unmerged files. Finally `git commit'.

tito

------------------------------------------------------------------------------
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