Syncing a Forked Repo

COMMAND LINE:

In Develop Branch:

• git fetch origin -v
• git fetch upstream -v
• git merge upstream/develop
• Run Update-database in VS Package Manager
  • Open Rock Project
  • Tools|Library Package Manager|Package Manager Console
  • Select 'Rock' under Default Project
  • Run 'Update-Database -Verbose'
  • Close Visual Studio
• git push
• git checkout < feature branch >
• git merge origin/develop
• git push (if feature branch is stored remotely on Github)

To update other branches, use the last three commands from the commandline instructions above

SMARTGIT:

In Develop Branch:

• Pull - from 'origin'
  • Merge fetched remote changes
  • CHECK: Update registered Submodules
  • CHECK: And initialize new Submodules
• Pull - from 'upstream'
  • Just fetch changes (grayed out)
  • CHECK: Update registered Submodules
  • CHECK: And initialize new Submodules
• Merge
  • Under 'Branches' drop-down, select your develop branches and your upstream\develop branches
  • Handle any conflicts
• Select all files in right-side pane
• Commit
• Run Update-database in VS Package Manager
  • Open Rock Project
  • Tools|Library Package Manager|Package Manager Console
  • Select 'Rock' under Default Project
  • Run 'Update-Database -Verbose'
  • Close Visual Studio
• Push