Wednesday, September 4, 2013

How to Enable Remote Desktop For Standard Users in Win 7

  1. Click Start -> Control Panel -> Systems
  2. Click Remote Setting on the left hand nav
  3. Select "Allo connections from computers running any version of remote desktop (less secure)
  4. Click Select users
  5. Add the "Standard" users that you want to enable the remote desktop

Monday, September 2, 2013

Git Pull Error - There is no tracking information for the current branch

Usually I can just do a git pull to get the latest update from master. However, I receive the following error/warning when I try to do git pull.

To solve this, I need to do "git pull origin master"

D:\xampp\htdocs\website>git pull
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From 192.168.1.15:web/website
   25bc2eb..0b66cee  master     -> origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> master