I just started learning git using source Tree.
I used mercurial hg workbench before and was quite comfortable with it. I usually created new feature/bug/ticket branch from the main branch to work on something. and if there were any updates to the main branch, I would pull the changes and merge the master branch into my local branch, to resolve any conflicts locally.
I imagine I can do similar in git using sourcetree. I am new to git and still reading about all the terminology around it, fetch, rebase, stash and so forth.
How would one usually achieve this in a team environment while using git.
say I'm working on a feature branch, and there is update to master branch, the one you know which will have lot of conflicts. so my idea is to do a pull on to my master branch. then merge that master branch into my local and resolve the conflicts locally .
how would i achieve this in git. do i do a pull, or fetch?
if i have uncomitted changes, do i stash my changes?