How to merge code in github?

Question

I am new to github.

I want to share code with my teammates.

Suppose i have a js file having code {previous code};
i pushed this to github remote.

now my friend pulled the remote repository and made some changes .
let it be {previous code} + {new code 1} .

Now i made some changes. let {previous code} + {new code 2} . now how to get this all code at one place by merging. ie {previous code} + {new code 1} + {new code 2}

more info: we are using webstorm IDE.

Answer 1

If you work on the same branch you simply have to pull the code from Github.
If you use different branches, you will need to merge your changes. You can do it locally with Webstorm.

---

---

Here is a screenshot where to find the git command under webstorm.