10 Sep
2014
10 Sep
'14
10:24 p.m.
On 9/10/2014 6:14 PM, Edward Diener wrote:
Git is starting to get to me.
I did a git pull from the latest master only to get a bunch of conflicts from the latest align submodule. I have never touched the align submodule locally so having conflict errors with it is absurd. After trying to straighten out the errors via a 'git reset --hard' for the align submodule, and still getting conflicts, I deleted the submodule locally just so I could get the latest master.
Now I can't seem to get back the submodule. No matter what I do the submodule is no longer recognized at the top level. What do I do ?
Never mind. the 'git submodule update --init' seems to have gotten it back.