Some rough guidelines for using Git in a single repository setup (i.e., no forking / pull requests, all collaborators have write access to the same central repository).

1. Pull before committing changes
2. Resolve conflicts if any
3. Try to keep changes small and group them into logical commits. If you added data files, or updated documentation make each of those a separate commit from changes to the NetLogo code. The one exception to this might be if you made changes to the code that logically correspond to changes in some input data files and you want to keep these logically grouped together.
4. Write descriptive log messages to remind yourself and summarize what changes you made to your teammates
5. Push your changes

Let's experience some merge conflicts!

Here's a line.

And another.

And some more.

Marco is here Who will be first?

Emily was here!

Chris' -- what happens when I change somebody elses statement? Does it just overwrite?

Marco is here

Testing CISA THANK YOU ALAN!

I'm here too! -Ryan :D

??

atlast I did it La is here too! La is here too!