I am new to using smart git. I usually create a feature from the git flow process of smart git and I usually get an "integrate develop" option to merge my local branch with updated develop branch. I however did not create my present branch as a feature, so I don't get that option when I right click on the local branch. How do I merge my develop branch into my current working local branch?
SmartGit's Integrate Develop is basically a git rebase or git merge. Hence, with a non-Git-Flow branch, first make sure your local branch (which should have been a feature) is checked out. Then right-click develop from the Branches view and select either Merge or Rebase HEAD to.