ݺߣ

ݺߣShare a Scribd company logo
1. Submodules
2. SubGit
3. Git flow
Git submodules
Добавление submodule в
     репозиторий


git submodule add <url> [name]
Clone существующего проекта, в
   котором есть submodules
 git clone <projectUrl>
 git submodule init
 git submodule update

 либо

 git clone --recursive
 <projectUrl>
Gotcha


Submodule «показывает» не на ветку,
    а на конкретный коммит!
Обновление
        submodule
cd <submodule>
git pull [origin master]
либо
git submodule foreach git pull
Обновление
        submodule (2)
Теперь нужно обновить «указатель» на
submodule:

cd ..
git add submodulemodule1
git commit -m “Updated submodule”
git push
Другого разработчик:


git pull
git submodule update
Узнать на какой коммит
«показывает» submodule


git submodule status
«Переключить» submodule
   на другой коммит

 cd <submodule>
 git checkout <коммит>
 cd ..
 git add <submodule>
 git commit -m “...”
SubGit


http://subgit.com
Git-flow


Vincent Driessen
http://nvie.com/posts/a-successful-git-
branching-model/
feature                          release
                   branches          develop        branches           hotfixes   master




Time
                                                                                          Tag
                                                                                          0.1

                        Major
                     feature for                               Severe bug
                        next                                    fixed for
       Feature         release                                 production:
          for                                                   hotfix 0.2
        future
       release
                                               Incorporate
                                                 bugfix in
                                                 develop


                                                                                          Tag
                                                                                          0.2



                                                                    Start of
                                                                    release
                  From this point                                  branch for
                     on, “next                                        1.0
                  release” means
                 the release after
                        1.0



                                                                      Only
                                                                    bugfixes!




                                               Bugfixes from
                                                                                          Tag
                                                 rel. branch
                                                   may be                                 1.0
                                                continuously
                                               merged back
                                               into develop
Создаем development-
       ветку


git checkout -b devel
Создаем ветку для
       фичи


git checkout -b feature/cool-
stuff
Пишем код фичи, коммитим
Внезапно


Критический баг в продакшн-версии
Переключаемся на ветку master:
git checkout master


Делаем ветку для хот-фикса:
git checkout -b hotfix/bad-
bug
<чиним>
Мержим фичу в master и devel:
git checkout master
git merge hotfix/bad-bug
git checkout devel
git merge hotfix/bad-bug
Возвращаемся к фиче


git checkout feature/cool-
stuff
<дописываем, коммитим>
Мержим фичу


git checkout devel
git merge --no-ff feature/
cool-stuff
Git
Слайды


http://zoid.cc/git-slides
Ad

Recommended

KEY
Git flow
Timur Vafin
PDF
To Go или не to Go
Ivan Zezyulya
PDF
Java BigData Full Stack Development (version 2.0)
Alexey Zinoviev
PPTX
Антон Григорьев, Git-flow: как построить процесс разработки и быстро получать...
ScrumTrek
PDF
Релиз менеджмент в Badoo (Илья Агеев)
Ontico
PDF
Badoo presentation-2012-rit-ageev
Yuriy Nasretdinov
PPTX
Презентация Git-flow (на русском)
Sergey Chudakov
PDF
2024 Trend Updates: What Really Works In SEO & Content Marketing
Search Engine Journal
PDF
Storytelling For The Web: Integrate Storytelling in your Design Process
Chiara Aliotta
PDF
Artificial Intelligence, Data and Competition – SCHREPEL – June 2024 OECD dis...
OECD Directorate for Financial and Enterprise Affairs
PDF
How to Leverage AI to Boost Employee Wellness - Lydia Di Francesco - SocialHR...
SocialHRCamp
PDF
2024 State of Marketing Report – by Hubspot
Marius Sescu
PDF
Everything You Need To Know About ChatGPT
Expeed Software
PDF
Product Design Trends in 2024 | Teenage Engineerings
Pixeldarts
PDF
How Race, Age and Gender Shape Attitudes Towards Mental Health
ThinkNow
PDF
AI Trends in Creative Operations 2024 by Artwork Flow.pdf
marketingartwork
PDF
Skeleton Culture Code
Skeleton Technologies
PDF
PEPSICO Presentation to CAGNY Conference Feb 2024
Neil Kimberley
PDF
Content Methodology: A Best Practices Report (Webinar)
contently
PPTX
How to Prepare For a Successful Job Search for 2024
Albert Qian
PDF
Social Media Marketing Trends 2024 // The Global Indie Insights
Kurio // The Social Media Age(ncy)
PDF
Trends In Paid Search: Navigating The Digital Landscape In 2024
Search Engine Journal
PDF
5 Public speaking tips from TED - Visualized summary
SpeakerHub
PDF
ChatGPT and the Future of Work - Clark Boyd
Clark Boyd
PDF
Getting into the tech field. what next
Tessa Mero
PDF
Google's Just Not That Into You: Understanding Core Updates & Search Intent
Lily Ray
PDF
How to have difficult conversations
Rajiv Jayarajah, MAppComm, ACC

More Related Content

Featured (20)

PDF
2024 Trend Updates: What Really Works In SEO & Content Marketing
Search Engine Journal
PDF
Storytelling For The Web: Integrate Storytelling in your Design Process
Chiara Aliotta
PDF
Artificial Intelligence, Data and Competition – SCHREPEL – June 2024 OECD dis...
OECD Directorate for Financial and Enterprise Affairs
PDF
How to Leverage AI to Boost Employee Wellness - Lydia Di Francesco - SocialHR...
SocialHRCamp
PDF
2024 State of Marketing Report – by Hubspot
Marius Sescu
PDF
Everything You Need To Know About ChatGPT
Expeed Software
PDF
Product Design Trends in 2024 | Teenage Engineerings
Pixeldarts
PDF
How Race, Age and Gender Shape Attitudes Towards Mental Health
ThinkNow
PDF
AI Trends in Creative Operations 2024 by Artwork Flow.pdf
marketingartwork
PDF
Skeleton Culture Code
Skeleton Technologies
PDF
PEPSICO Presentation to CAGNY Conference Feb 2024
Neil Kimberley
PDF
Content Methodology: A Best Practices Report (Webinar)
contently
PPTX
How to Prepare For a Successful Job Search for 2024
Albert Qian
PDF
Social Media Marketing Trends 2024 // The Global Indie Insights
Kurio // The Social Media Age(ncy)
PDF
Trends In Paid Search: Navigating The Digital Landscape In 2024
Search Engine Journal
PDF
5 Public speaking tips from TED - Visualized summary
SpeakerHub
PDF
ChatGPT and the Future of Work - Clark Boyd
Clark Boyd
PDF
Getting into the tech field. what next
Tessa Mero
PDF
Google's Just Not That Into You: Understanding Core Updates & Search Intent
Lily Ray
PDF
How to have difficult conversations
Rajiv Jayarajah, MAppComm, ACC
2024 Trend Updates: What Really Works In SEO & Content Marketing
Search Engine Journal
Storytelling For The Web: Integrate Storytelling in your Design Process
Chiara Aliotta
Artificial Intelligence, Data and Competition – SCHREPEL – June 2024 OECD dis...
OECD Directorate for Financial and Enterprise Affairs
How to Leverage AI to Boost Employee Wellness - Lydia Di Francesco - SocialHR...
SocialHRCamp
2024 State of Marketing Report – by Hubspot
Marius Sescu
Everything You Need To Know About ChatGPT
Expeed Software
Product Design Trends in 2024 | Teenage Engineerings
Pixeldarts
How Race, Age and Gender Shape Attitudes Towards Mental Health
ThinkNow
AI Trends in Creative Operations 2024 by Artwork Flow.pdf
marketingartwork
Skeleton Culture Code
Skeleton Technologies
PEPSICO Presentation to CAGNY Conference Feb 2024
Neil Kimberley
Content Methodology: A Best Practices Report (Webinar)
contently
How to Prepare For a Successful Job Search for 2024
Albert Qian
Social Media Marketing Trends 2024 // The Global Indie Insights
Kurio // The Social Media Age(ncy)
Trends In Paid Search: Navigating The Digital Landscape In 2024
Search Engine Journal
5 Public speaking tips from TED - Visualized summary
SpeakerHub
ChatGPT and the Future of Work - Clark Boyd
Clark Boyd
Getting into the tech field. what next
Tessa Mero
Google's Just Not That Into You: Understanding Core Updates & Search Intent
Lily Ray
How to have difficult conversations
Rajiv Jayarajah, MAppComm, ACC

Git