[asdf-devel] Question about git

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? Thanks, r