StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>At first you should get into the habit of committing often. Basically, every step you do can result in a commit. These aren't expensive in git but can make your life much easier as the typically working granularity is on the commit level. You shopuld also do this to experiments and tests, you never know when these code parts become important :)</p> <p>Once you start to commit early and often, you should start to get into the habit of using topic branches. In difference to e.g. SVN, branches are also cheap. a branch is basically just a pointer to a commit, the HEAD of the branch, so it is not much different from a tag. Using branches is in the heart of git and the quest to find a usage model of git for you basically resolves around finding a branching model that suits you and our workflow.</p> <p>So you should start to use separate branches for every feature you develop. Once it is finished, you can merge the branch back into mainline/master/whatever and just delete the branch. The upside of this approach is that you can develop your features independently from each other and don't need to <a href="http://vimeo.com/11040425" rel="nofollow">Experience Bij</a> prematurely.</p> <p>Now if you have committed everything and put stuff into neat branches, you can push all the branches up to the server. As you don't have any uncommitted changes in your local repositories and you have always worked on top of the existing commits, you shouldn't have any merge conflicts, as the branches are only fast-forwarded.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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