[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: GOP-PROP 3: C++ formatting
From: |
Jan Warchoł |
Subject: |
Re: GOP-PROP 3: C++ formatting |
Date: |
Sat, 25 Jun 2011 22:15:54 +0200 |
2011/6/25 Graham Percival <address@hidden>
>
> On Sat, Jun 25, 2011 at 09:18:13PM +0200, Jan Warchoł wrote:
> > I understand that i should call these in separate branches, not in master.
> > address@hidden:~/lilypond-git$ git branch astyle
>
> That creates a new branch. I think you should have done the
> git pull origin dev/gperciva-style
> without making a new branch first.
IIRC i tried it and it resulted in merge conflicts and generally
messed-up repository.
cheers,
Janek
- Re: GOP-PROP 3: C++ formatting, (continued)
- Re: GOP-PROP 3: C++ formatting, Jan Warchoł, 2011/06/22
- Re: GOP-PROP 3: C++ formatting, Graham Percival, 2011/06/22
- Re: GOP-PROP 3: C++ formatting, Jan Warchoł, 2011/06/22
- Re: GOP-PROP 3: C++ formatting, Graham Percival, 2011/06/22
- Re: GOP-PROP 3: C++ formatting, Carl Sorensen, 2011/06/22
- Re: GOP-PROP 3: C++ formatting, Jan Warchoł, 2011/06/25
- Re: GOP-PROP 3: C++ formatting, Graham Percival, 2011/06/25
- Re: GOP-PROP 3: C++ formatting,
Jan Warchoł <=
Re: GOP-PROP 3: C++ formatting, Trevor Daniels, 2011/06/22
Re: GOP-PROP 3: C++ formatting, Hans Aberg, 2011/06/22
Re: GOP-PROP 3: C++ formatting, Valentin Villenave, 2011/06/25
Message not available