On Mon, 2015-02-16 at 17:47 -0500, Andrew Stitcher wrote: > On Mon, 2015-02-16 at 14:32 -0500, Alan Conway wrote: > > I work on a mix of SVN and GIT-based projects so I switch between trunk > > and master a lot. Proton used to be an SVN based project. I repeatedly > > stub my toe on the old "trunk" branch which has been left lying around > > with some random commit at it's head. > > > > Can we please do any one of the following: > > - delete it. > > - rename it to something else. > > - make it a symbolic reference to master. > > > > I don't care which, I'm just tired of typing "git checkout trunk" by > > reflex and being allowed to continue down the rat-hole till some ancient > > proton bug crops up and I have another DOH! moment. > > Why do you say there is a trunk branch at apache at all? (didn't we go > over this before - it seems familiar). As far as I can tell the apache > repo has no branch called trunk. > > You probably need to prune your local repo's idea of the remote > branches. > > Try > > git remote prune origin (or whatever your apache remote is called) >
You are right. Apologies for spam!
