To Update from your branch:
-
Before you begin, make sure your branch has the most recent pull from Master (Backup files if you worked on them before you pulled)
-
Commit Changes to Current Branch
-
Open Master Branch
-
Under "Branch" choose "Merge into Current Branch..."
-
Select your Branch and press "Merge in master"
-
Push commit