I have a local repo with 2 branches
On branch master
Your branch is up-to-date with 'origin/master'.
(use "git add <file>..." to include in what will be committed)
nothing added to commit but untracked files present (use "git add" to track)
git checkout develop
error: The following untracked working tree files would be overwritten by checkout:
Please move or remove them before you can switch branches.
Summary: you need to switch to your develop branch, pull the code from the remote repo, then merge it into master (locally) and push it back to remote repo (into master branch)
git checkout develop git pull origin develop git checkout master git merge develop git push origin master