Pick a member of the team as the responsible party to manage the organization. For now I'll refer to him as the GitHub Lead.
- Github Lead responsibility
- The organization name has to be unique in github
- Github Lead responsibility
- Fork the project's repo from the organization.
- Clone the forked version to your development environment.
- Each feature of the app should be developed in a separate branch.
Sync development with upstream
- Github Lead responsibility
- Let's see whats going on with Git right now!
git status
- You should see a message that says "You have unmerged paths", followed by a list of files in red. These are files with merge conflicts.
- Conflicts will look like this in the file that has a merge conflict.
- You are presented with both conflicting versions:
<<<<<<<master
<p><q>They call me MR. PIG. AAAAAH!</q> - Pumba</p>
========
<p><q>What do you want me to do, dress in drag and do the hula?</q> - Timon</p>
>>>>>>>HEAD
- Keep one and make sure all
<<<
,====
,>>>>
merge conflict delimiters are removed before saving and commiting.
- If the merge conflict is too bad (SEVERAL files displaying merge conflicts). It's usually a sign of something else going wrong.
- First: You can abort the merge by running the command:
git merge --abort
- If that doesn't work:
- Do not ignore, or otherwise keep working on your files at this point.
- Reach out to the Git Lead.
- If all else fails, create an issue to get support.