Be careful - you have case mixing between local and remote branch!

Suppose you are in local branch downloadmanager now (git checkout downloadmanager)

You have next options:

1. Specify remote branch in pull/push commands every time (case sensitive):

   git pull origin DownloadManager

   or

   git pull origin downloadmanager:DownloadManager

2. Specify tracking branch on next push:

   git push -u origin DownloadManager

   (-u is a short form of --set-upstream)

   this will persist downloadmanager:DownloadManager link in config automatically (same result, as the next step).

3. Set in git config default remote tracking branch:

   git branch -u downloadmanager origin/DownloadManager

   (note, since git 1.8 for branch command -u is a short form of --set-upstream-to, which is a bit different from deprecated --set-upstream)

   or edit config manually (I prefer this way):

   git config --local -e

   -> This will open editor. Add block below (guess, after "master" block):

   [branch "downloadmanager"]
           remote = origin
           merge = refs/heads/DownloadManager
   

and after any of those steps you can use easily:

git pull

If you use TortoiseGit: RightClick on repo -> TortoiseGit -> Settings -> Git -> Edit local .git/config

Hi @johnwslongland 👋

Not a dumb question at all. Yes you can safely remove that fetch line from your .git/config. It’s forcing Git to fetch a branch that no longer exists, which is why git fetch upstream keeps failing. Either delete that line or reset the upstream remote (git remote remove upstream → git remote add upstream <repo-url>), then fetch again. That should resolve the error 👍

Is the remote branch actually called "master"?

Those settings allow git to know what to push to or what to pull from:

push the current branch to update a branch with the same name on the receiving end. Works in both central and non-central workflows.

It should only be:

git config --global push.default current

(I am not aware of that setting for pull)

I would recommend:

• using the remote name instead of its url: origin
• using a push with makes a tracking connection between your local and upstream branch:

So:

git push -u origin master
git pull origin

After that, a simple git push will be enough: see "Why do I need to explicitly push a new branch?" for more.

There are probably some commands to resolve it, but I would start by looking in your .git/config file for references to that branch, and removing them.