KarlKorr
KarlKorr

Reputation: 31

GitHub: pulling and pushing project with my collaborator

I'm working on a project created by a friend. He created his project on Intellij and connected it to a Repository on GitHub. Committing and pushing works, but i (a collaborator) don't understand how i can pull the project from git, and doing merges/pushing/committing. Any help? I've watched plenty of tutorials, but everyone only address the problem of connecting a project to github.

Upvotes: 1

Views: 44

Answers (1)

Kendzi
Kendzi

Reputation: 21

Are you able to clone the project?

Make sure you are actually under the collaborators and you can access it trough Github. Then clone, steps here.

After making changes go to the "VCS"->"Git"->"Commit", then "Push"

  1. Then go to "VCS"->"Git"->"Merge Changes"
  2. Select the branch you want to merge from
  3. Resolve any conflicts and merge.

Upvotes: 2

Related Questions