Fix conflicts.

jedi/third_party/README_typeshed.md

@@ -0,0 +1,30 @@
+# Typeshed in Jedi
+
+Typeshed is used in Jedi to provide completions for all the stdlib modules.
+
+The relevant files in jedi are in `jedi/inference/gradual`. `gradual` stands
+for "gradual typing".
+
+## Updating Typeshed
+
+Currently Jedi has a custom implementation hosted in
+https://github.com/davidhalter/typeshed.git for two reasons:
+
+- Jedi doesn't understand Tuple.__init__ properly.
+- Typeshed has a bug: https://github.com/python/typeshed/issues/2999
+
+Therefore we need a bit of a complicated process to upgrade typeshed:
+
+    cd jedi/third_party/typeshed
+    git remote add upstream https://github.com/python/typeshed
+    git fetch upstream
+    git checkout jedi
+    git rebase upstream/master
+    git push -f
+
+    git push
+    cd ../../..
+    git commit jedi/third_party/typeshed -m "Upgrade typeshed"
+
+If merge conflicts appear, just make sure that only one commit from Jedi
+appears.