So currently I've been coding rails apps using git and github. I usually work alone, but in my latest project I'm working with a second developer. I'm trying to figure out the standard methods for working with another user.

Currently, I had him fork my gitrepo, and then just submit pull requests when he has changes ready. That hasn't been so bad, except I code a lot more - and when there are changes in the fork queue for him to push, many of them fail (even if he hasn't made any changes from the last time he pushed mine). 

The whole process just seems more efficient for him to re-fork everytime, which makes me think we're going about something incorrectly. Should we be using branches instead of forks? Or maybe forks and branches?

Thanks!