Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Truth be told, I started to work on typing a nice, long, detailed response... but I this is already explained much better than I could at <a href="http://excess.org/article/2008/07/ogre-git-tutorial/" rel="nofollow noreferrer">http://excess.org/article/2008/07/ogre-git-tutorial/</a>. He covers the use of different branches, remotes, and merging. It's also done in screencast, so take an hour, grab some coffee, and enjoy the lecture.</p> <p>Specific to your question: you shouldn't use a directory setup. Git doesn't handle branching with directories in the same way that SVN does with branch folders. Branches in git are an entirely different thing. While you may not setup a central repository (I recommend it), you should setup a single <strong>master</strong> branch that everybody commits their final, clean work to.</p> <p>One example repository of mine has a screenshot at <a href="http://commons.wikimedia.org/wiki/File:Git_branches_example.png" rel="nofollow noreferrer">Wikimedia Commons</a>. In my example, "bartender" submits his code only in tar chunks, so I have to import it myself to manage it. "master" (shown here only as remotes/elf/master) is a public svn repository that I import and base changes off of. "<strong>autocracy</strong>" is my own baseline for the code, and "<strong>private</strong>" is where I keep a config file with passwords that I want to manage but never publish. Check the <strong>timestamps</strong> on private, and you'll notice they don't line up with the branches below. This is because I rebase that <em>branch onto "autocracy" instead of merging</em>.</p> <p>You'll notice two remote references: <em>elf and bard</em>. These are two remote machines of mine that host the software. I can push and pull my branches to there as I wish. In your case, you'd have remote repositories of your other developers, and they'd modify their own branches. Watching the tutorial will give you a better idea of how it works. Good luck :)</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload