git - Handling project files when multiple users are commiting -

i'm not sure workflow supposed when working other users making changes repository.

here's situation: repository created colleague , makes first commit. ended using git clone project onto computer work on. after working on project, commits bunch of updated files.

now, repository different have locally. have not committed own changes yet not know best way proceed. commit , whatever changes made automatically added file along colleague's changes? however, locally not have updated files repository...

you have fetch changes remote repository local repository can know them. can either

git fetch origin

to fetch changes, around , merge/rebase. or:

git pull optional --rebase.

this way merge or rebase local changes on top of incomming changes upstream.