A Git Workflow Model or Branching StrategyVivek Parihar
Git branching model or Workflow. A Git Workflow is a recipe or recommendation for how to use Git to accomplish work in a consistent and productive manner. Git workflows encourage users to leverage Git effectively and consistently. Git offers a lot of flexibility in how users manage changes. This ppt is based on The Git Flow. It was created by Vincent Driessen in 2010 and it is based in two main branches with infinite lifetime:
master — this branch contains production code. All development code is merged into master in sometime.
develop — this branch contains pre-production code. When the features are finished then they are merged into develop.
Note: slides produced from the blog post of https://nvie.com/posts/a-successful-git-branching-model/
What's TBD, some facts and how TBD with feature toggle can increase release frequency, lower release risk, decouple release from code deployment. DevOpsDays, Taipei, 2017
Git and Git Workflow Models as Catalysts of Software DevelopmentLemi Orhan Ergin
This is the slides of my latest talk in DevFest Istanbul 2013 which is organized by Google Developers Group Istanbul. The content mainly has 3 sections. Git branching model in theory, creating a feature by git commands and git best practices.
A Git Workflow Model or Branching StrategyVivek Parihar
Git branching model or Workflow. A Git Workflow is a recipe or recommendation for how to use Git to accomplish work in a consistent and productive manner. Git workflows encourage users to leverage Git effectively and consistently. Git offers a lot of flexibility in how users manage changes. This ppt is based on The Git Flow. It was created by Vincent Driessen in 2010 and it is based in two main branches with infinite lifetime:
master — this branch contains production code. All development code is merged into master in sometime.
develop — this branch contains pre-production code. When the features are finished then they are merged into develop.
Note: slides produced from the blog post of https://nvie.com/posts/a-successful-git-branching-model/
What's TBD, some facts and how TBD with feature toggle can increase release frequency, lower release risk, decouple release from code deployment. DevOpsDays, Taipei, 2017
Git and Git Workflow Models as Catalysts of Software DevelopmentLemi Orhan Ergin
This is the slides of my latest talk in DevFest Istanbul 2013 which is organized by Google Developers Group Istanbul. The content mainly has 3 sections. Git branching model in theory, creating a feature by git commands and git best practices.
Are you sick of Merge Hell? Do your feature branches go rogue? Do you spend more time fiddling with your Version Control System than doing actual development work? Then Trunk Based Development might be for you. Facebook does it. Google does it. Instead of messing with multiple branches, just use your master branch. Always. In addition to giving you an overview about how Trunk Based Development works, where it shines and where the pitfalls are, this talk will also cover the necessary techniques to succeed with it, such as Branch By abstraction, Feature Toggles and backwards compatible Database Migrations.
Developing and releasing software in a team setting can be messy. With many developers working on the same code base, we need a workflow that allows a team to develop in parallel and allows for new functionality to be safely integrated into our environments and applications. In order to achieve such a workflow, leveraging a branching strategy is a must. There are, however, many to choose from. In this talk, we'll be discussing Trunk-Based Development, a branching strategy that we leverage extensively here at Nebulaworks.
Key Takeaways:
*Learn about the various benefits that we get from leveraging Trunk-Based Development.
*We will talk about general best practices that should be followed when developing new functionality
*We will be discussing the release process (How and when to leverage Release Candidate Branches and git tags)
*We will walk through the Trunk-Based Development process in a demo where we develop a simple python app!
How do you choose a git workflow that increases productivity and reduces the friction of your team? What are the battle tested practices of successful teams that moved to git? How is git used inside Atlassian?
As you might have heard git has many compelling features and has gained incredible momentum in the industry at large. Yet understanding how an enterprise team can adopt it can be daunting. The presentation aims to help answer these questions and more:
- Available collaboration models when using a distributed version control system like git
- Branching models that foster and enhance parallel development
- Emerging code best practices and choices that can be safely adopted when migrating to git
- How Continuous Integration changes when your team embraces git
Git is not just a version control system. Git can change the way you interact with your team members. Lot’s of teams don’t think about reflecting their development workflow in Git and just use it out-of-the-box. Git, however, can be much more powerful, giving your team a boost in productivity, protecting your delivery pipeline and helping you to work better together.
In this session we will start with a central workflow that is used by a lot of Subversion teams. You will learn how to practically integrate ALM solutions like continuous deployment, code reviews, change tracking and much more into your individual workflow. You will find out how to protect your master branch from accidental commits, broken builds and unreviewed code. This presentation will help you discover the best way to work together as a team – whether you’re yet to migrate to Git or even an experienced Git user.
Git Introduction for beginners. Based on the Atlassian git tutorial.
git init, add, commit, push, pull, remote.
introduction to version controls.
git is a software version control and team management tool.
I gave this presentation at the Israeli ALM User Group.
This is part 2 of a 2 part series on Git and Git workflows and introduces the most common Git workflows used by individuals, small co-located teams, large organizations, and distributed groups.
** DevOps Training: https://www.edureka.co/devops **
This Edureka Git Tutorial explains what is version control system and why Git is the best tool for version control. You will get to learn what is Git through various operations that Git supports. Below are the topics covered in the tutorial:
1. Version Control System
2. Types of Version Control System
3. Version Control System Tools
4. What is Git?
5. Git Features
6. Git Workflow
7. Parallel Development
8. Hands-On
Check our complete DevOps playlist here (includes all the videos mentioned in the video): http://goo.gl/O2vo13
Alm tce parallel development by Liya Kats and Miron Gopher from Tikal Knowledge given at Tikal TCE:
http://www.tikalk.com/tce-event-281210-revolution-application-lifecycle-management-krypton
Are you sick of Merge Hell? Do your feature branches go rogue? Do you spend more time fiddling with your Version Control System than doing actual development work? Then Trunk Based Development might be for you. Facebook does it. Google does it. Instead of messing with multiple branches, just use your master branch. Always. In addition to giving you an overview about how Trunk Based Development works, where it shines and where the pitfalls are, this talk will also cover the necessary techniques to succeed with it, such as Branch By abstraction, Feature Toggles and backwards compatible Database Migrations.
Developing and releasing software in a team setting can be messy. With many developers working on the same code base, we need a workflow that allows a team to develop in parallel and allows for new functionality to be safely integrated into our environments and applications. In order to achieve such a workflow, leveraging a branching strategy is a must. There are, however, many to choose from. In this talk, we'll be discussing Trunk-Based Development, a branching strategy that we leverage extensively here at Nebulaworks.
Key Takeaways:
*Learn about the various benefits that we get from leveraging Trunk-Based Development.
*We will talk about general best practices that should be followed when developing new functionality
*We will be discussing the release process (How and when to leverage Release Candidate Branches and git tags)
*We will walk through the Trunk-Based Development process in a demo where we develop a simple python app!
How do you choose a git workflow that increases productivity and reduces the friction of your team? What are the battle tested practices of successful teams that moved to git? How is git used inside Atlassian?
As you might have heard git has many compelling features and has gained incredible momentum in the industry at large. Yet understanding how an enterprise team can adopt it can be daunting. The presentation aims to help answer these questions and more:
- Available collaboration models when using a distributed version control system like git
- Branching models that foster and enhance parallel development
- Emerging code best practices and choices that can be safely adopted when migrating to git
- How Continuous Integration changes when your team embraces git
Git is not just a version control system. Git can change the way you interact with your team members. Lot’s of teams don’t think about reflecting their development workflow in Git and just use it out-of-the-box. Git, however, can be much more powerful, giving your team a boost in productivity, protecting your delivery pipeline and helping you to work better together.
In this session we will start with a central workflow that is used by a lot of Subversion teams. You will learn how to practically integrate ALM solutions like continuous deployment, code reviews, change tracking and much more into your individual workflow. You will find out how to protect your master branch from accidental commits, broken builds and unreviewed code. This presentation will help you discover the best way to work together as a team – whether you’re yet to migrate to Git or even an experienced Git user.
Git Introduction for beginners. Based on the Atlassian git tutorial.
git init, add, commit, push, pull, remote.
introduction to version controls.
git is a software version control and team management tool.
I gave this presentation at the Israeli ALM User Group.
This is part 2 of a 2 part series on Git and Git workflows and introduces the most common Git workflows used by individuals, small co-located teams, large organizations, and distributed groups.
** DevOps Training: https://www.edureka.co/devops **
This Edureka Git Tutorial explains what is version control system and why Git is the best tool for version control. You will get to learn what is Git through various operations that Git supports. Below are the topics covered in the tutorial:
1. Version Control System
2. Types of Version Control System
3. Version Control System Tools
4. What is Git?
5. Git Features
6. Git Workflow
7. Parallel Development
8. Hands-On
Check our complete DevOps playlist here (includes all the videos mentioned in the video): http://goo.gl/O2vo13
Alm tce parallel development by Liya Kats and Miron Gopher from Tikal Knowledge given at Tikal TCE:
http://www.tikalk.com/tce-event-281210-revolution-application-lifecycle-management-krypton
Skip Staging! Test Docker, Helm, and Kubernetes Apps like a ProCodefresh
>>Watch the full presentation, demo, and live Q&A here: https://codefresh.io/saucelabs-lp
The traditional "staging" model is getting in the way of adequately testing our applications. With the power of Kubernetes, Helm, Saucelabs, and Codefresh we can dramatically speed up and improve the quality of integration testing using short-lived environments.
Join Kubernaut Dan Garfield as he shows you how to:
- Create Automated short-lived environments for every commit/branch,
- run integration tests in a scalable way, and
- use Helm, Kubernetes, Codefresh, and Saucelabs integrations
Sign up for a FREE Codefresh account today: https://codefresh.io/codefresh-signup/
How to go beyond traditional Scrum principles and scale to globally distributed teams with Continuous Delivery and Subversion. Presented by Andy Singleton of Assembla and Scott Rudenstein of WANdisco. Presented Nov. 15, 2012. 30 minutes.
Multi-QA Environment, parallel development with Gitdopejam
Using Git for source code management, this is the process we're using to support developing multiple projects in parallel (same code base), with multiple QA environments.
Simplified CI/CD Flows for Salesforce via SFDX - Downunder Dreamin - SydneyAbhinav Gupta
These slides were focused on Down Under Dreamin event, where a good emphasis was given on explaining CI/CD to wider audience including admins, who are not very comfortable with it.
Followed by an overview and walk-thru of Bitbucket setup process via SFDX
On 19 February I held a presentation for my colleagues about distributed version control systems (DVCS). My main goal was to inform them on what I think is the next logical step in source control.
Also see http://vlent.nl/weblog/2010/02/25/distributed-version-control-systems-presentation
My talk presentation from SQA Days 21 conference.
During last two years I've been working in Agile teams and quite often have come across the situation when the feature is pretty big, but they still want to release it at the end of the sprint. That is in spite of the fact, that there is a great risk of violation of the timing and poor product quality.
So what should we, quality guards, do when eventually everything depends on us?
My report presents the analysis of the development stages from the testing point of view in such a difficult situation and provides tips for success.
PuppetConf 2016: Continuous Delivery and DevOps with Jenkins and Puppet Enter...Puppet
Here are the slides fromCarl Caum and Brian Dawson's PuppetConf 2016 presentation called Continuous Delivery and DevOps with Jenkins and Puppet Enterprise. Watch the videos at https://www.youtube.com/playlist?list=PLV86BgbREluVjwwt-9UL8u2Uy8xnzpIqa
A shallow look at all one needs to know when dealing with Distributed Systems, such as the CAP theorem, Harvest/Yield metrics, Partitioning vs. Replication, and Consensus Algorithms.
The banking industry needs to know about blockchains, as it stands to possibly force a paradigm change upon the entire industry. This talk focuses on introducing blockchains to laymen bankers in the 8th Annual Bank Tech Asia (Manilla Series).
A talk about the basics of consensus in the context of distributed computing. Touches on the Byzantine General problem, and a quick introduction to 2 Phase Commits and Basic Paxos.
ZeroMQ is a good tool to know, because it provides a huge variety of socket and messaging patterns that you can leverage in your infrastructure to solve specific problems without using heavyweight message queues to do the same job. This talk illustrates 4 basic sockets provided by zeromq and the many ways you can use them.
Defensive programming in Javascript and Node.jsRuben Tan
Various factors to consider when trying to adopt a defensive programming mindset, methodology and process. This is especially useful for teams working with node.js.
Le nuove frontiere dell'AI nell'RPA con UiPath Autopilot™UiPathCommunity
In questo evento online gratuito, organizzato dalla Community Italiana di UiPath, potrai esplorare le nuove funzionalità di Autopilot, il tool che integra l'Intelligenza Artificiale nei processi di sviluppo e utilizzo delle Automazioni.
📕 Vedremo insieme alcuni esempi dell'utilizzo di Autopilot in diversi tool della Suite UiPath:
Autopilot per Studio Web
Autopilot per Studio
Autopilot per Apps
Clipboard AI
GenAI applicata alla Document Understanding
👨🏫👨💻 Speakers:
Stefano Negro, UiPath MVPx3, RPA Tech Lead @ BSP Consultant
Flavio Martinelli, UiPath MVP 2023, Technical Account Manager @UiPath
Andrei Tasca, RPA Solutions Team Lead @NTT Data
Encryption in Microsoft 365 - ExpertsLive Netherlands 2024Albert Hoitingh
In this session I delve into the encryption technology used in Microsoft 365 and Microsoft Purview. Including the concepts of Customer Key and Double Key Encryption.
Observability Concepts EVERY Developer Should Know -- DeveloperWeek Europe.pdfPaige Cruz
Monitoring and observability aren’t traditionally found in software curriculums and many of us cobble this knowledge together from whatever vendor or ecosystem we were first introduced to and whatever is a part of your current company’s observability stack.
While the dev and ops silo continues to crumble….many organizations still relegate monitoring & observability as the purview of ops, infra and SRE teams. This is a mistake - achieving a highly observable system requires collaboration up and down the stack.
I, a former op, would like to extend an invitation to all application developers to join the observability party will share these foundational concepts to build on:
State of ICS and IoT Cyber Threat Landscape Report 2024 previewPrayukth K V
The IoT and OT threat landscape report has been prepared by the Threat Research Team at Sectrio using data from Sectrio, cyber threat intelligence farming facilities spread across over 85 cities around the world. In addition, Sectrio also runs AI-based advanced threat and payload engagement facilities that serve as sinks to attract and engage sophisticated threat actors, and newer malware including new variants and latent threats that are at an earlier stage of development.
The latest edition of the OT/ICS and IoT security Threat Landscape Report 2024 also covers:
State of global ICS asset and network exposure
Sectoral targets and attacks as well as the cost of ransom
Global APT activity, AI usage, actor and tactic profiles, and implications
Rise in volumes of AI-powered cyberattacks
Major cyber events in 2024
Malware and malicious payload trends
Cyberattack types and targets
Vulnerability exploit attempts on CVEs
Attacks on counties – USA
Expansion of bot farms – how, where, and why
In-depth analysis of the cyber threat landscape across North America, South America, Europe, APAC, and the Middle East
Why are attacks on smart factories rising?
Cyber risk predictions
Axis of attacks – Europe
Systemic attacks in the Middle East
Download the full report from here:
https://sectrio.com/resources/ot-threat-landscape-reports/sectrio-releases-ot-ics-and-iot-security-threat-landscape-report-2024/
DevOps and Testing slides at DASA ConnectKari Kakkonen
My and Rik Marselis slides at 30.5.2024 DASA Connect conference. We discuss about what is testing, then what is agile testing and finally what is Testing in DevOps. Finally we had lovely workshop with the participants trying to find out different ways to think about quality and testing in different parts of the DevOps infinity loop.
Builder.ai Founder Sachin Dev Duggal's Strategic Approach to Create an Innova...Ramesh Iyer
In today's fast-changing business world, Companies that adapt and embrace new ideas often need help to keep up with the competition. However, fostering a culture of innovation takes much work. It takes vision, leadership and willingness to take risks in the right proportion. Sachin Dev Duggal, co-founder of Builder.ai, has perfected the art of this balance, creating a company culture where creativity and growth are nurtured at each stage.
SAP Sapphire 2024 - ASUG301 building better apps with SAP Fiori.pdfPeter Spielvogel
Building better applications for business users with SAP Fiori.
• What is SAP Fiori and why it matters to you
• How a better user experience drives measurable business benefits
• How to get started with SAP Fiori today
• How SAP Fiori elements accelerates application development
• How SAP Build Code includes SAP Fiori tools and other generative artificial intelligence capabilities
• How SAP Fiori paves the way for using AI in SAP apps
GraphRAG is All You need? LLM & Knowledge GraphGuy Korland
Guy Korland, CEO and Co-founder of FalkorDB, will review two articles on the integration of language models with knowledge graphs.
1. Unifying Large Language Models and Knowledge Graphs: A Roadmap.
https://arxiv.org/abs/2306.08302
2. Microsoft Research's GraphRAG paper and a review paper on various uses of knowledge graphs:
https://www.microsoft.com/en-us/research/blog/graphrag-unlocking-llm-discovery-on-narrative-private-data/
Dev Dives: Train smarter, not harder – active learning and UiPath LLMs for do...UiPathCommunity
💥 Speed, accuracy, and scaling – discover the superpowers of GenAI in action with UiPath Document Understanding and Communications Mining™:
See how to accelerate model training and optimize model performance with active learning
Learn about the latest enhancements to out-of-the-box document processing – with little to no training required
Get an exclusive demo of the new family of UiPath LLMs – GenAI models specialized for processing different types of documents and messages
This is a hands-on session specifically designed for automation developers and AI enthusiasts seeking to enhance their knowledge in leveraging the latest intelligent document processing capabilities offered by UiPath.
Speakers:
👨🏫 Andras Palfi, Senior Product Manager, UiPath
👩🏫 Lenka Dulovicova, Product Program Manager, UiPath
GDG Cloud Southlake #33: Boule & Rebala: Effective AppSec in SDLC using Deplo...James Anderson
Effective Application Security in Software Delivery lifecycle using Deployment Firewall and DBOM
The modern software delivery process (or the CI/CD process) includes many tools, distributed teams, open-source code, and cloud platforms. Constant focus on speed to release software to market, along with the traditional slow and manual security checks has caused gaps in continuous security as an important piece in the software supply chain. Today organizations feel more susceptible to external and internal cyber threats due to the vast attack surface in their applications supply chain and the lack of end-to-end governance and risk management.
The software team must secure its software delivery process to avoid vulnerability and security breaches. This needs to be achieved with existing tool chains and without extensive rework of the delivery processes. This talk will present strategies and techniques for providing visibility into the true risk of the existing vulnerabilities, preventing the introduction of security issues in the software, resolving vulnerabilities in production environments quickly, and capturing the deployment bill of materials (DBOM).
Speakers:
Bob Boule
Robert Boule is a technology enthusiast with PASSION for technology and making things work along with a knack for helping others understand how things work. He comes with around 20 years of solution engineering experience in application security, software continuous delivery, and SaaS platforms. He is known for his dynamic presentations in CI/CD and application security integrated in software delivery lifecycle.
Gopinath Rebala
Gopinath Rebala is the CTO of OpsMx, where he has overall responsibility for the machine learning and data processing architectures for Secure Software Delivery. Gopi also has a strong connection with our customers, leading design and architecture for strategic implementations. Gopi is a frequent speaker and well-known leader in continuous delivery and integrating security into software delivery.
FIDO Alliance Osaka Seminar: The WebAuthn API and Discoverable Credentials.pdf
40 square's git workflow
1. 40 Square’s GIT Workflow
Who Am I?
Lead developer in 40 square software
First Love: 6 years in Java (omfg what was I thinking)
Ex-GF: PHP hobbyist turned full time engineer
Wife: Node.JS, and Javascript in general
Twitter: @roguejs
This will be a warp speed presentation!
2. Mercurial vs Git
We used fogbugz + kiln initially
Started off with feature branches
Merging conflicts took forever
REAL REASON: Bad practices
HIDDEN REASON: Fogbugz is expensive...
3. Other annoyances
No dry runs
Difficult to do code review
No cherry-picking
Bad planning and structure
Branching is expensive?
4. Our Deployment Process
LDC
Dev C1 LDC
B1
push hg
pull CDC
Dev
repo B
Branches CDC
Dev - qa C
- master
5. Deployment Problems
Accidentally merge into master? RED ALERT
QA testing on old code
Dev: “Is my feature merged yet?”
Lead: “Hold on, I’m fixing conflict #13285582309583”
live
dev1
invalidates previous test
dev2
6. Why Git?
Because github is sexy
Actually, because it’s cheaper than Kiln
Why not bitbucket?
Because github is sexy, and because I said so
Actually, because github still is cheaper (repo vs users)
Git has more options for branching and merging
7. Our Goals
Have a staging server that is a clone of live server
Abstract devs from live server
No more “it’s just one line of code, can I push to live
directly?”
Rapid deployment and lesser merge conflicts
Build better practices
8. Vincent Driessen Model
40 square style
Long Running Branches:
master - live servers
staging - last line of defense
devel - weekly deployments
Distributed blessed repo model
Blessed repo managed by integrators
Each dev gets own fork
9. Forking Model & Policy
Your own fork is your own responsibility
Feel free to force update your own fork
Rebase before sending pull requests
10. Typical Workflow (dev)
Dev starts work on an issue in Pivotal
Determine what kind of issue:
P1- branch off from staging
Bugs & Features - branch off from devel
Pull upstream often and rebase on upstream
Rebase again before sending pull request
12. Typical Workflow (integrator)
Integrator receives pull request
Create a new branch in blessed repo
Pull update into that branch
Review code
Merge into staging/devel
16. Devel branch deployment
Every MONDAY, merge to staging
Once testing completes, tag and merge to master
If testing fails, all bug fixes are designated as P1
Bug fixes for release candidate is merged into staging
master
fail
staging
fix
devel
17. Staging branch deployment
Merge to staging and test
Once QA approves it, merge to master AND devel
Policy: Only one commit allowed to dangle
master
never!!!
staging
devel
18. Policies
Do NOT force update blessed repo
I will hunt you down, and kill you
Always rebase before sending pull request
If P1, branch off staging. Otherwise, branch off devel
Manage pull requests NOW
No dangling commits on staging
19. Benefits
Established workflow = peaceful work environment
Predictable integration & deployment
Conflicts = dev responsibility instead of integrator’s
Can dick around with own repo without killing blessed
repo
No more unpredictable testing environment
20. More Information
A successful branching model
http://nvie.com/posts/a-successful-git-branching-
model/
Git
http://git-scm.com/
Github
http://github.com/
Git video tutorials
http://gitcasts.com/
