[SM-Discuss] Merge of xorg-modular repo into devel-xorg-modular branch

Eric Sandall eric at sandall.us
Wed Oct 24 11:43:05 EDT 2007


On Tue, 2007-10-23 at 20:28 -0500, Robin Cook wrote:
> On Mon, 2007-10-22 at 13:17 -0700, Eric Sandall wrote:
> 
> > You can do a `rm -rf xorg-modular; git clone grimoire xorg-modular; cd  
> > xorg-modular; git checkout -b xorg-modular origin/devel-xorg-modular`  
> > from where you store your git repos. If you're worried about space, a  
> > `git clone -s` *may* work, but I haven't tried it with having the two  
> > directories contain different checkouts.
> > 
> > -sandalle
> > 
> 
> This didn't work for me the "git checkout b xorg-modular
> origin/devel-xorg-modular" gave this error:
> 
> git checkout: updating paths is incompatible with switching
> branches/forcing
> Did you intend to checkout 'origin/devel-xorg-modular' which can not be
> resolved as commit?

Hrm...maybe try checking out xorg-modular in your grimoire directory
first, and then do the xorg-modular clone and checkout?

-sandalle



More information about the SM-Discuss mailing list