On Thu, Apr 10, 2014 at 4:31 PM, Mostafa wrote:

Glen,

Are you rewriting history or force pushing commits to "https://github.com/glenfe/align". I have a local repo set to track your remote and every time I pull to update to your new commits I get merge conflicts. In fact a new clone shows that the history for master has only one commit, the most recent one, when it should show at least three. Can you avoid doing this in the future?

Will do; sorry about that. Glen