Thank you! ________________________________ git remote add upstream git@github.com:TEIC/TEI.git (if you haven’t already done this) git pull upstream dev ought to do the trick. I have on my local HD a copy of a fork one of our repos.[1] The interesting bit of this repo is in its dev branch. But sadly, its dev branch is somewhat behind our dev branch. So I would like to merge our dev branch in. How do I do that? I.e., how do I specify that I want the git merge​ command to use our repo’s dev branch (not the current repo’s dev branch, which would be silly, as I am on the current repo’s dev branch) as the upstream? Note [1] https://github.com/sanskrit-coders/Stylesheets.githttps://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fsanskrit-coders%2FStylesheets.git&data=04%7C01%7Cs.bauman%40northeastern.edu%7Cbaf629663b014cc8dc8d08d8ee1fdf33%7Ca8eec281aaa34daeac9b9a398b9215e7%7C0%7C0%7C637521167958174672%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=VFSyvROSo4T%2BE4ueGuhNhOxf2Krs%2BrPH8P%2BCccVrnY0%3D&reserved=0 to be precise, but that detail does not matte

If you don't have keys set up, use the HTTPS URL instead: git remote remove upstream git remote add upstream https://github.com/TEIC/TEI.git git pull upstream dev On Tue, Mar 23, 2021 at 2:42 PM Bauman, Syd wrote:

Hmm… error msg makes me suspect that the cmd is expecting me to be using a public key to authenticate with GitHub, but I use a password: BTW,

$ git remote add upstream git@github.com:TEIC/TEI.git $ git pull upstream dev The authenticity of host 'github.com (140.82.114.4)' can't be established. RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. Are you sure you want to continue connecting (yes/no/[fingerprint])? yes

Warning: Permanently added 'github.com,140.82.114.4' (RSA) to the list of known hosts. git@github.com: Permission denied (publickey). fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists.

BTW, did you actually mean the username “git”? Just in case I tried with “sydb”, too; same error.

------------------------------ git remote add upstream git@github.com:TEIC/TEI.git (if you haven’t already done this) git pull upstream dev

ought to do the trick.

_______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council