[asdf-devel] Question about git

[Samium Gromoff]

From: Robert Goldman <rpgoldman at sift.info>
> How are we supposed to be reasoning about the multiple git repositories
> out there?
> 
> I have been pulling from the master/public one and then working locally.
> 
> Fare works on his personal working copy.
> 
> When I make a patch on mine, based on public, seems like I sometimes end
> up with patches that Fare can't apply cleanly to his.
> 
> How are we supposed to handle this?

Well, there's no magic allowing to automatically compose changes that
were concurrently made in the same area -- you have to merge them
manually.

Why wouldn't you work off the top of the Fare's tree?


regards,
  Samium Gromoff
--
                                 _deepfire-at-feelingofgreen.ru
O< ascii ribbon campaign - stop html mail - www.asciiribbon.org