On Mon, Aug 24, 2015 at 10:09:51AM -0400, Pat Barron wrote:
> [...] I decide that what I really want to do at this point is
> abandon the changes I made that the maintainer didn't take, and get
> my fork into sync with the maintainer's repo.
git merge -X theirs maintainers-branch
or
git pull -X theirs maintainers-remote
--
Eric Cooper e c c @ c m u . e d u