From: David Date: Sat, 21 Jun 2008 15:53:13 GMT Subject: Re: avoiding committing personal cruft Message-ID: <18c1e6480806210853k72274173gaaeb11dd7991c8ed@mail.gmail.com> In-Reply-To: On Sat, Jun 21, 2008 at 3:20 PM, James Sadler wrote: > > The ide-branch has nothing in it except the cruft from the IDE and the > paths leading up to that cruft. > The master branch has a .gitignore that ignores the IDE files so I > won't end up polluting master by accident. > > It's a manageable solution for now. I tend to think of it > conceptually as 'layering' two branches: I want the > content of both present in the working tree. > > I was just wondering if anyone else has tried something similar. > Sounds like a normal use of topic branches. Branches rebased against master, where you you keep changes you don't want to go into the main branch at this time. David.