[09:29:26] <f0ff886f>	 i'm thinking i could just reset to the remote? i have no changes from upstream (i do have some stashed, but I will deal with those after I get over to the latest master)
[10:36:33] <andre>	 what's the context?
[12:33:34] <f0ff886f>	 I am trying to follow https://we.phorge.it/w/installation_and_setup/update_from_phabricator/ and at the "git pull" stage, I get about a hundred merge conflicts. I would have thought the upgrade would be seamless. Has enough time elapsed since the fork that I need to reset to upgrade?
[12:37:02] <f0ff886f>	 I just did a `git reset --hard origin/master` now and the repo is on the new stage, lets see if it works... oh wait the docs actually say that as the last line? To do a hard reset. Then why does it have the `git pull` after the branch upstream change for the phabricator repo?
[14:35:46] <avivey>	 you're right, f0ff886f, that's redundant.
[14:35:46] <avivey>	 I think I fixed that now.