title: Merge two forks in Git?
body: <p>I am a beginner to Git and only use Git Bash for basic things. I mostly commit/push/whatever else inside my IDE or with TortoiseGit. I'm trying to do something rather like <a href="https://stackoverflow.com/questions/5326894/git-how-to-merge-branches">this</a>, I think :. (bear with me here, I'm not sure if I'm using proper terminology...)</p>
  
  <p>So here's the situation: There's a main branch on Github. (let's say it's at github.com/branchadmin/info.git). If someone wants to improve the code of the main branch, they create a fork and push their changes. If a developer of the main branch likes the changes that a user made, they push to the main fork. That's great and all, but what if the developer also changes something else? That leaves the user's repo out of date, and I haven't found a way to "merge" it. (correct terminology? idk)</p>
  
  <p>Without having to delete the fork and start a new one in order to stay up-to-date, how could the user do such a "merge?"</p>
  
  <p>Thanks to all in advance :)</p>