Re: GOP-PROP 3: C++ formatting

[Jan Warchoł]

W dniu 23 czerwca 2011 00:03 użytkownik Carl Sorensen
<address@hidden> napisał:
>
> For the short term, you can do
>
> git pull origin dev/gperciva-fixcc
> git pull origin dev/gperciva-astyle
>
> to get those branches.

I understand that i should call these in separate branches, not in master.
...something doesn't work:
address@hidden:~/lilypond-git$ git branch astyle
address@hidden:~/lilypond-git$ git checkout astyle
Switched to branch 'astyle'
address@hidden:~/lilypond-git$ git pull origin dev/gperciva-astyle
>From git://git.sv.gnu.org/lilypond
 * branch            dev/gperciva-astyle -> FETCH_HEAD
Auto-merging lily/beam.cc
CONFLICT (content): Merge conflict in lily/beam.cc
Automatic merge failed; fix conflicts and then commit the result.

I'm not desperate to see these differencies, so if it's a trouble to
fix this/explain it to me then don't bother.
Btw, Graham wrote "origin/dev/gperciva-fixcc", and Carl wrote "origin
dev/gperciva-fixcc" (with a space). Why?

cheers,
Janek