title: Git: getting changes from another branch
body: <p>I have a project which uses git and I'd like to start a new branch to add a major new feature.</p>
  
  <p>Under the <code>main</code> branch, I'll continue to add bug fixes and minor features. At regular intervals I'd like to pull the changes from the main branch into my "major new feature" branch. What's the best way to do this? </p>
  
  <p>Eventually, I'll merge the "major new feature" branch into the main branch.   </p>