Git is a version control system that allows cloning repositories, pulling changes, branching, adding files, committing changes with comments, merging branches without fast-forwarding, resolving conflicts during merging, and applying patches from emails. Key commands include git clone, git pull, git checkout -b, git add, git commit, git merge --no-ff, git push, git format-patch, and git am. Branches can be created, changes committed, merged back to master with conflicts resolved, and patches applied from emails.

1. Git
Git

2. • clone pull
• branch
•
• (git add)
• branch

3. ( )
• git clone <shared repository URL>
• git pull
• git checkout -b <new branch name>
• git add <path to be added>
• git commit -m ’comment’

4. • ( )
• ( )

5. • pull
• master merge (–no-ff )
– conflict
– 3-way merge ?
• push

6. • git checkout master
• git pull
• git merge --no-ff <branch name>
• git push

7. • format-patch master
•
• git am ( )
:

8. ( )
• branch
• git am
• master merge

9. ( )
• git am -3 3-way merge