How do I get a working system?

harvey:~/Sourceforge/csound/csound5> git pull
M       CMakeLists.txt
M       Engine/csound_orc.l
U       Engine/csound_orc_semantics.c
M       Engine/new_orc_parser.c
M       H/csound.hpp
M       H/csound_orc.h
M       Opcodes/pvsbasic.c
M       Opcodes/pvscent.c
M       SConstruct
M       interfaces/CppSound.cpp
M       interfaces/CppSound.hpp
M       interfaces/python_interface.i
M       util/pvanal.c
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm '
as appropriate to mark resolution, or use 'git commit -a'.

In particulat how do I "fix them up in the work tree"
I have tried editing, deleteing checking out -- everything I know but
I just have a broken system

==John ffitch

------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Hi,

I think the thing with git is that it won't merge modified files
automatically, which actually makes a lot of sense since automatic
merging doesn't garantee a working program. From what little I know of
git, if you do:
git status
It should tell you csound_orc_semantics.c needs to be committed, so
you can just commit that file and then pull.

With git, you need to get the idea that commit is always local, so you
are committing to your local branch, and then you can pull or push
from it.

Cheers,
Andres

On Mon, May 16, 2011 at 2:19 PM, john ffitch  wrote:
> How do I get a working system?
>
> harvey:~/Sourceforge/csound/csound5> git pull
> M       CMakeLists.txt
> M       Engine/csound_orc.l
> U       Engine/csound_orc_semantics.c
> M       Engine/new_orc_parser.c
> M       H/csound.hpp
> M       H/csound_orc.h
> M       Opcodes/pvsbasic.c
> M       Opcodes/pvscent.c
> M       SConstruct
> M       interfaces/CppSound.cpp
> M       interfaces/CppSound.hpp
> M       interfaces/python_interface.i
> M       util/pvanal.c
> Pull is not possible because you have unmerged files.
> Please, fix them up in the work tree, and then use 'git add/rm '
> as appropriate to mark resolution, or use 'git commit -a'.
>
> In particulat how do I "fix them up in the work tree"
> I have tried editing, deleteing checking out -- everything I know but
> I just have a broken system
>
> ==John ffitch
>
> ------------------------------------------------------------------------------
> Achieve unprecedented app performance and reliability
> What every C/C++ and Fortran developer should know.
> Learn how Intel has extended the reach of its next-generation tools
> to help boost performance applications - inlcuding clusters.
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>

------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listi