Answers
Here are the answers to the questions given above:
- Use
git init,git add ., andgit committo create a repository from existing files. Usegit cloneto get your own copy of the existing repository. - Use
git commitorgit commit -ato create a new revision, and usegit pushto publish changes. - Use
git fetchto get updates from other developers, orgit pullto get updates and merge them together. Usegit merge(or, as mentioned in later chapters,git rebase) to combine changes. - Merge conflicts are presented using the
<<<<<<<,=======, and>>>>>>>markers; you can also find the|||||||marker used, depending on the configuration. To resolve the conflicts, you need to edit files marked as conflicting into shape, usegit addon them when finished, and then finalize the merge withgit commitorgit merge --continue(or rebase withgitrebase --continue). - To make Git ignore specific types of files, you need to add appropriate...
