mlt/zandy — comment on commit 6bc5053dde7e278d9c47b3b1508a999f6d0ecc9d
File:  line 0
By ajlyon:

Yes-- it may be easier to do a new clone of the repository and apply the changes manually... It can be very hard to maintain a branch long-term if you don't merge changes from the main branch regularly.