Git Ready! Workflows

Sep 26, 201315 likes12,276 views

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

Question time
at the end
Submit your
questions

Nicola Paolucci
Developer Advocate / Git Evangelist
@durdndurdn.comI come out nice in pictures, I know :-).

Cheap local branching
Full local history
Speed
Staging area
prominent in Open Source
Huge community
You heard has
Feature based workﬂow
10x the speed of svn
Distributed
cryptographic integrity

ground breaking paradigm
is ground breaking

1
Common Practices
2
3
Collaboration model
We’ll cover how to choose:
Branching model
Continuous Integration4

Which collaboration model?1
Easy, right?

Fully decentralized
Anarchy
I do my thing
I do my thing, too
ANARCHY
here’s mine, who tells
john?
look ma, a goat!

Blessed repository with
Gatekeeper
He is cool
Gatekeeper
To have your work
accepted, talk to him

and Lieutenants
Dictator
long live the King!
Lieutenants guard
the King
Blessed repository

Shared common
repository
we share “everything”
luckily no goats here
Centralised

atlassian.com/git
More on Collaboration models

Centralized allows ﬁne
grained ACLs
Branch & Repo permissions

Integration with your
Issue tracking and CI

Product Releases1
Continuous Delivery2
Two common Branching Models

One Central Repository1
One Branch per Feature
One Branch per Bugﬁx
2
3
Time
master
feature
branches
PRJ-123-description

One Central Repository1
One Branch per Feature
One Branch per Bugﬁx
2
3
Time
master
bugﬁx
branch
PRJ-123-bug-description

Stable Branches4
master is alpha / RC5
Pull Requests6
Before merges
Long running
Time
master
stable
branch
PRJ-345-bug-description
bugﬁx
2.2

master is in production1
staging is the next version
new features oﬀ staging
2
3
with branch names like: username/ISSUE-KEY-summary
promoted from staging, can receive hot-fixes

Hey I have some code I
want to merge here,
take a look?
Low friction
collaboration
Pull Request
I have some
code here!
Can I merge
it here?

Complete visibility1
No per Dev remotes required
KISS
2
3
Pros of a Single Repo
All feature
branches
available

Every one has their
remote repository
With Forks
Full remote copy,
each has one
Integrator, Gatekeeper,
Tech Lead, etc.

Manage codebase maturity1
X department and 3rd parties
Dev to Dev interactions
2
3
Read “Cross”

What happens to CI with git?1
An explosion of branches2
3 Performance degradation of build sys

Building everything is expensive1
Automatically build stable and master2
3 Manually trigger feature branch builds

Time
master
stable
branch
PRJ-345-bug-description
bugﬁx
2.2
stable
branch
2.1
Automatic MERGES!

Ripple merges1
Server side update hook2
3 Or tool support

Read more at:
bitly.com/automatic-merges

Branching
Model
Adopt Git
Practices
Automation &
CI setup
Conclusions
Product
workflow
Continuous
delivery
workflow
Embrace PR
Build
automatically,
but leave
knobs!
Single Repo
or Forks
Collaboration
Model
Centralized
Hooks, hooks
everywhere

Nicola Paolucci
THANKS YOU FOR YOUR ATTENTION
@durdndurdn.comShould I change the pic?

Git Repository Management
for Enterprise Teams
Free Git Code Hosting
for Small Teams
Free Git Desktop client
for Mac or Windows
Atlassian

The document discusses several common Git workflows: - The Basic/Centralized Workflow is the most basic, similar to SVN, with a single master branch and all changes committed directly to it. - The Feature Branch Workflow involves branching by feature, with each developer working on their own branch before merging into master via a pull request. This avoids broken code and allows code review. - The Gitflow Workflow manages features, releases, and hotfixes across main branches like master and develop, plus feature, release, and hotfix branches. It is more complex but provides more structure than the Feature Branch. - The Forking Workflow differs in that there is no central repository - each developer has their own public server

Git workflowsThuc Le Dong

The document discusses Git workflows, comparing centralized and feature branch workflows. It then describes Vincent Driessen's branching model which uses two main branches (master and develop) and three supporting branch types (feature, release, hotfix). The master branch is stable and used for production, while develop is integrated features. Feature branches branch off develop for new work, and release branches prepare releases by merging to develop and master. Hotfix branches fix production issues. The model aims to support collaboration while keeping branches stable. Special cases in applying the model are also addressed.

A successful Git branching model abodeltae

This document outlines a Git branching model to allow for smooth development with isolated features. The model uses main branches of master and develop, and support branches of feature, release, and hotfix. Feature branches isolate new work and merge back to develop. Release branches prepare releases and merge to both develop and master. Hotfix branches address urgent bugs in master and also merge to both develop and master. This model aims to allow multiple developers to work independently while reducing conflicts and enabling flexible releases and rollbacks.

Git and GitFlow branching modelPavlo Hodysh

Version control systems like Git allow teams to collaborate on code by automatically backing up work, tracking changes over time, and easily sharing code between collaborators. Git uses repositories to store source code and a branching model like GitFlow to coordinate work between team members on features, releases, and hotfixes in a stable, collaborative way. Key concepts in Git include repositories, working copies, commits, updates, pulls, and pushes used to integrate changes between local and remote repositories.

Git branching strategiesjstack

The document discusses various Git branching strategies, including: - Common concepts like branches, merges, and pull requests - Popular workflows like GitHub Flow and branching per platform/release - A case study of Telenet's workflow of using long-running release branches merged from master for testing before production deployment - Best practices like using pull requests for code reviews, keeping long-running branches stable, and ensuring features are fully tested before being merged.

Git branching-modelAaron Huang

This document outlines a Git branching model for managing code development. It describes using main branches like Master and Develop and support branches like Feature, Release, and Hotfix. The model advocates separating work into feature branches, merging them into develop, and merging develop into master upon release. It also lists tools for implementing git flow and sources for more information.

A Git Workflow Model or Branching StrategyVivek Parihar

Vivek Parihar is a serial entrepreneur and polyglot engineer who currently serves as VP of Engineering at XOXODay. He has co-founded two startups and previously served as Head of Engineering for Mobile at Yatra. When not working, he enjoys extreme thrill-seeking adventures like trekking and boxing. The document then outlines Gitflow, a branching model for managing code development, including feature branches for new features, release branches to prepare releases, and hotfix branches for urgent bug fixes in production.

Git workflow in agile developmentZack Siri

This document provides an overview of Git workflow in agile development. It introduces basic Git commands like git init, git add, git commit, git branch, git checkout, and git merge. It then demonstrates how these commands can be used in a typical workflow involving feature branches, hotfix branches, and merging changes back into the master branch for deployment. Key steps shown include creating feature branches off of develop, pushing changes to those branches, merging the feature branches back into develop once complete, creating hotfix branches off of master as needed, and merging those hotfixes back to both master and develop.

Git best practices 2016Otto Kekäläinen

This document provides best practices and guidelines for using Git version control. It discusses topics such as why version control is important, how to write good commit messages, reviewing code changes, using branches, and more. The key recommendations are to focus commit messages on the why rather than what changed, get code reviews on the master branch, and never force push to master to avoid diverging versions.

Introduction to github slideshareRakesh Sukumar

This document provides an introduction to GitHub. It defines Git as a version control system that records changes to files and allows users to revert files to earlier versions. GitHub is described as a hosting service for Git repositories that provides a graphical interface and collaboration features. The document outlines key GitHub concepts like repositories, branches, commits, forking, pull requests and issues. It also summarizes the typical GitHub workflow and includes a link to download GitHub Desktop for a demo.

Git Branching for Agile Teams Atlassian

Git and branching workflows enable agile teams to deliver features faster while protecting the main code line from broken changes. The document discusses two common branching models: branch-per-issue and multiple-version support. With branch-per-issue, each developer works on a feature branch, merging to master once tests pass. An integration branch can also be used to catch incompatible changes before merging to master. The multiple-version model maintains stable release branches while new features branch off the alpha master branch. Both models incorporate continuous integration and peer review to catch errors early.

How We Use GitHubNYC DevShop

Collaborative development with gitJoseluis Laso

Git is a source control management system that allows developers to work collaboratively by controlling versions from a central repository. Each team member has a local copy of the repository. Commands are used to upload and download changes from the central repository. Best practices for collaboration include using branches like develop and feature branches, and following a roadmap of branching, testing, merging into develop, and releasing to production.

Intro to git and git hubVenkat Malladi

This document provides an introduction to Git and GitHub. It outlines the basics of Git including initializing repositories, tracking changes, branching, merging, and resolving conflicts. It also covers GitHub concepts such as cloning repositories from GitHub to a local machine and pushing/pulling changes between local and remote repositories. The document explains how to collaborate on projects hosted on GitHub using Git.

Git-flow workflow and pull-requestsBartosz Kosarzycki

Git-flow is a Git workflow that advocates using separate branches for features, releases, and hotfixes. It uses a master branch for production-ready code and a develop branch as the main branch where features are integrated. Feature branches are created from develop and merged back after completion. Release branches are created from develop for final testing before merging to both master and develop. Hotfix branches are directly created from master to quickly patch production releases. Pull requests are recommended to communicate changes between branches.

GitLab 8.5 Highlights and Step-by-step tutorialHeather McNamee

Git collaborationPham Quy (Jack)

This document discusses different workflows for collaborating on code using Git and pull requests: The pull request process allows a developer to create a feature branch, push it to a remote repository, and file a pull request for review. Reviewers can discuss and update the code before it is merged into the main repository. Common workflows include the centralized workflow where all developers work on the same branch, the feature branch workflow where each feature has a dedicated branch, and the Gitflow workflow which separates development, release, hotfix and feature branches according to a strict convention. The forking workflow is used for large open source projects where each team clones the main repository and collaborates independently before merging changes back.

Continuous delivery with open source toolsSebastian Helzle

Git in Continuous DeploymentBrett Child

The document discusses using Git and continuous deployment workflows. It proposes a development model using Git branching where developers work on feature branches off a development branch. When a feature is ready, it is merged into development and then propagated to test and production branches. This allows code to be deployed frequently while separating stable and unstable code. Challenges with other version control systems like SVN are noted. Tools like scripts for multi-repo projects and automated deployments are suggested to enable continuous deployment with Git.

Bitbucket git-bamboo-jiralenamattt

The document provides information about version control systems like Git and tools from Atlassian like Bitbucket, Bamboo, and Jira. It discusses how Git is used to manage source code changes over time. It also explains how to install and configure Git, and commonly used Git commands. The document then describes how Bitbucket can be used as a code repository and linked to Jira for issue tracking. Bamboo is introduced as a tool for continuous integration and deployment that can be linked to Bitbucket and Jira as well. Steps for installing and configuring Bamboo pipelines are also outlined.

Switching to GitStephen Yeargin

GitMayank Patel

Git basics to advance with diagramsDilum Navanjana

Trunk-Based DevelopmentBryan Liu

Git Series. Episode 3. Git Flow and Github-FlowMikhail Melnik

Git censored.keymkramer2

This document discusses using Git to develop code. It begins by motivating the use of Git over the traditional client view by noting that Git allows for code to be backed up, easily shared, and developed in branches without destroying work. It then outlines how Git can provide snapshots of work, create branches for ideas, undo changes, share branches, and commit freely without others seeing. The document briefly introduces the Git object model and suggests a simple Git workflow and using git-p4 to integrate with a Perforce server. It cautions that rebasing rewrites history and can cause issues for downstream branches.

Git Pull RequestsCallon Campbell

Git pull requests allow for better collaboration and code reviews. Pull requests initiate discussions about proposed code changes by showing exactly what would be merged. Team members can provide feedback and additional commits can be added to address feedback before merging. It is recommended to work on topic branches for new features or bugs rather than directly on the main branch. Pull requests can be automatically built using services like TeamCity to validate tests pass before merging.

Jenkins workflows and Best PracticesKenichi Shibata

This document discusses CI/CD workflows and best practices using Jenkins. It explains that Jenkins helps automate the software development process by building code whenever commits are pushed to version control. Good CI practices include integrating with source control, running all tests, and providing feedback via chat systems. The document provides examples of basic, agile team, and advanced CI workflows and recommendations for configuring Jenkins, including using plugins, securing authentication, and proxying Jenkins within a VPN.

My Git workflowRui Carvalho

The document discusses Git workflows and best practices for managing source code versions. It recommends using small, focused branches for new features or bug fixes, then pushing branches to the remote repository for review and merging. It also recommends forking repositories for outside contributions, where others can submit pull requests to merge changes into the main repository. Following these practices helps keep code organized, allows for easy integration of new changes, and facilitates collaboration.

Git Branching ModelLemi Orhan Ergin

Git branching model for efficient development. (1) Main branches like master and development are used for new features and releases. (2) Supporting branches like bugfix and feature branches have limited lifespans. (3) The workflow handles features, bugs, and releases across environments while maintaining a clean history. Rebasing is preferred over merging for cleaner histories when working locally, while merging integrates changes for public branches.

More Related Content

What's hot (20)

Git best practices 2016Otto Kekäläinen

Introduction to github slideshareRakesh Sukumar

Git Branching for Agile Teams Atlassian

How We Use GitHubNYC DevShop

Collaborative development with gitJoseluis Laso

Intro to git and git hubVenkat Malladi

Git-flow workflow and pull-requestsBartosz Kosarzycki

GitLab 8.5 Highlights and Step-by-step tutorialHeather McNamee

Git collaborationPham Quy (Jack)

Continuous delivery with open source toolsSebastian Helzle

Git in Continuous DeploymentBrett Child

Bitbucket git-bamboo-jiralenamattt

Switching to GitStephen Yeargin

GitMayank Patel

Git basics to advance with diagramsDilum Navanjana

Trunk-Based DevelopmentBryan Liu

Git Series. Episode 3. Git Flow and Github-FlowMikhail Melnik

Git censored.keymkramer2

Git Pull RequestsCallon Campbell

Jenkins workflows and Best PracticesKenichi Shibata

Git best practices 2016Otto Kekäläinen

Introduction to github slideshareRakesh Sukumar

Git Branching for Agile Teams Atlassian

How We Use GitHubNYC DevShop

Collaborative development with gitJoseluis Laso

Intro to git and git hubVenkat Malladi

Git-flow workflow and pull-requestsBartosz Kosarzycki

GitLab 8.5 Highlights and Step-by-step tutorialHeather McNamee

Git collaborationPham Quy (Jack)

Continuous delivery with open source toolsSebastian Helzle

Git in Continuous DeploymentBrett Child

Bitbucket git-bamboo-jiralenamattt

Switching to GitStephen Yeargin

GitMayank Patel

Git basics to advance with diagramsDilum Navanjana

Trunk-Based DevelopmentBryan Liu

Git Series. Episode 3. Git Flow and Github-FlowMikhail Melnik

Git censored.keymkramer2

Git Pull RequestsCallon Campbell

Jenkins workflows and Best PracticesKenichi Shibata

Viewers also liked (20)

My Git workflowRui Carvalho

Git Branching ModelLemi Orhan Ergin

Git workflows presentationMack Hardy

Enterprise GitLotharSchubert

Although Git is the world’s leading distributed version control system, the enterprise has been slow and tentative in its adoption. Concerned with security breaches, compliance violations and lack of governance, many organizations have chosen to take a "wait and see" approach. With TeamForge, Git is ready for the enterprise. TeamForge lets you realize all the benefits of Git while ensuring the security, governance and manageability your business demands. With TeamForge, you can even manage Git and Subversion together, within each individual project.

Why Aren't You Using Git Flow?John Congdon

git flowGabriel Gottgtroy Zigolis

Git-flow is a Git extension that provides commands to support a branching model for version control proposed by Vincent Driessen. It adds commands for managing features, releases, and hotfixes directly in Git. The key commands create and manage branches for new features, releases, and hotfixes, as well as publishing/finishing the branches. It helps structure the repository by keeping the main branches clean and separate from ongoing development.

Using GitAbayomi Ayoola

Git BasicLuke Luo

GIT_In_90_Minutesvimukthirandika

Git is a distributed version control system designed and developed by Linus Torvalds for Linux kernel development. It allows for distributed workflows where developers have full control over their local copy of the codebase. Git uses a three-tree model with the workspace, staging area, and local repository to track changes to files. Common Git commands allow users to initialize repositories, add and commit files, create and switch between branches, merge code from different branches, and collaborate remotely through fetching, pulling and pushing changes.

GitMajid Hajiloo

Version control systems track changes to source code over time by keeping a complete history of file versions in a database. Version control provides benefits like a change history, branching and merging, and traceability. Git is a distributed version control system that allows developers to work offline and collaborate by sharing changes. Developers use branches to work independently on features or bugs, then merge branches to combine changes.

Git WorkflowsNoam Kfir

Introduction to git administrationShawn Doyle

Git and Git Workflow Models as Catalysts of Software DevelopmentLemi Orhan Ergin

Attack-driven defenseZane Lackey

This document provides an overview of an "attack-driven defense" approach presented by the co-founder and CSO of Signal Sciences. The summary focuses on three key points: 1) The approach focuses on building defenses around real-world attack patterns by instrumenting detection mechanisms around the initial compromise, persistence/C2, and lateral movement stages of an attack. 2) Detection involves analyzing endpoint command logs to identify anomalous commands for non-technical users or unique command combinations/bursts for technical users. Common attack patterns are also flagged. 3) A host-based intrusion detection system called "Tripyarn" is presented, which aims to alert on common host-level persistence mechanisms used by attackers

Getting Git RightSven Peters

Git workflowsSergiu Savva

The document discusses different types of Git workflows including centralized, feature branch, and forking workflows. It mentions the centralized workflow allows developers comfortable with Subversion to experience Git benefits without entirely new processes, serving as a friendly transition. Feature branches are developed independently then merged into the main branch, while forking lets anyone contribute by making changes on their personal fork then submitting a pull request.

Division of roles and responsibilitieskausargulaid

The document outlines the roles and responsibilities of four people - Andrea, Kuran, Kausar, and James - in filming a project. Andrea is responsible for setting dates, organizing the location, planning the story structure and narrative, and editing. Kuran decides character roles, chooses music, selects the location, helps plan the story, and takes photographs. Kausar organizes props, edits, chooses music, helps plan the idea and story, and plans costumes. James chooses costumes, edits, helps plan the location, and ensures proper equipment selection, and plays the lead character no. 2 role.

MongoDB at ex.fmMongoDB

The document discusses Jonathan Marmor's upcoming presentation on exfm's use of MongoDB. It will cover what exfm does, which includes having a browser extension that turns websites into playlists. It will then discuss how exfm uses MongoDB, including an overview of its environment, data models, server architecture, management tools, and future plans. It will also cover Jonathan's upcoming Monthly Music Hackathon in NYC.

Secret Life of a Weather Datum end of project eventlifeofdata

This document outlines the methods and key themes of a research project studying the journey of weather data from its production to its reuse. The project uses case studies and interviews with participants across different parts of the data journey, including weather station operators, climate scientists, and financial data companies. It aims to understand the socio-cultural values and practices shaping how weather data is collected, shared, and interpreted. The methods discussed are interviews, observations, document analysis and digital ethnography. Key themes that emerged include the relationships between people and organizations across space and time along the data journey, the diversity of openness and transparency in different contexts, and the dependency of data infrastructure on cultural values like voluntarism and public service.

Tecnologìas de la Información y la ComunicaciónYenmely

My Git workflowRui Carvalho

Git Branching ModelLemi Orhan Ergin

Git workflows presentationMack Hardy

Enterprise GitLotharSchubert

Why Aren't You Using Git Flow?John Congdon

git flowGabriel Gottgtroy Zigolis

Using GitAbayomi Ayoola

Git BasicLuke Luo

GIT_In_90_Minutesvimukthirandika

GitMajid Hajiloo

Git WorkflowsNoam Kfir

Introduction to git administrationShawn Doyle

Git and Git Workflow Models as Catalysts of Software DevelopmentLemi Orhan Ergin

Attack-driven defenseZane Lackey

Getting Git RightSven Peters

Git workflowsSergiu Savva

Division of roles and responsibilitieskausargulaid

MongoDB at ex.fmMongoDB

Secret Life of a Weather Datum end of project eventlifeofdata

Tecnologìas de la Información y la ComunicaciónYenmely

More from Atlassian (20)

International Women's Day 2020Atlassian

10 emerging trends that will unbreak your workplace in 2020Atlassian

Forge App ShowcaseAtlassian

Ever wondered what Atlassian engineers do in their 20% time? Join Forge engineering lead Tim Pettersen on a lightning tour of how Forge is being used inside Atlassian. Attendees will get a rare view into some of the apps, tools, and tweaks we’ve built internally on top of Forge in the spirit of dogfooding and innovation. Come along and be inspired with some great ideas for improving and automating your own teams' workflows!

Let's Build an Editor Macro with Forge UIAtlassian

Race out of the gate with Forge UI: a new way of building UI extensions for Atlassian products. In this session, Forge UI Developer Experience lead Peter Gleeson will demonstrate how build an Editor macro from scratch! Attendees will learn about Forge foundational concepts such as the FaaS dev loop, Forge CLI, and how to construct UIs from Forge UI components. This session provides a great introduction to the Forge platform for any developer looking to get productive with editor apps and Forge UI.

Meet the Forge RuntimeAtlassian

In the words of Jeff Atwood: “JavaScript is the lingua franca of the web”. It’s also the first language we’ve chosen to support in Forge. In this session, Forge engineer Shorya Raj will walk through the Node.js isolate based runtime you’ll be using to write apps for Forge. Attendees will learn about the unique features of the Forge JavaScript Runtime, such as automatic authentication and tenant context management. Shorya will also cover the differences between the Runtime, conventional browser, and Node.js APIs. Developers or attendees with some programming experience will get the most out of this session.

Forge UI: A New Way to Customize the Atlassian User ExperienceAtlassian

UI extensibility is an integral part of Atlassian's ecosystem story. In cloud, traditionally this has been accomplished with the humble iframe. In this session you will learn about Forge UI, an additional and innovative way to build visual apps for Atlassian products. Join Product Manager Simon Kubica and Senior Developer Michael Oates from the Forge team in exploring the underlying concepts and technology powering Forge UI, and learn how it will unlock exciting new opportunities in our ecosystem.

Take Action with Forge TriggersAtlassian

This document discusses using triggers to automate actions in Forge apps. It begins with an overview of triggers and then discusses: - Product triggers that are triggered by events in Atlassian products like Jira, Confluence etc. - Web triggers that are triggered by HTTP requests to a Forge function. - How to authenticate and make requests to external services like Opsgenie from Forge functions in response to triggers. - Demos of building a Forge app that responds to Jira issue creation by assigning the issue and notifying Opsgenie. The document provides details on the event payload formats, making authenticated requests, and deploying/managing the Forge app lif

Observability and Troubleshooting in ForgeAtlassian

The document discusses the evolution of software development from bare metal servers to virtualization, containers, and serverless functions. It notes how debugging and observability have become more difficult as software moves to remote "somebody else's computer" environments. The author introduces Forge as Atlassian's solution for providing developers a declarative language and best-in-class experience for building user interfaces on serverless infrastructure, including features for debugging, monitoring, and security.

Trusted by Default: The Forge Security & Privacy ModelAtlassian

Security and trust have become increasingly important requirements for our customers in Cloud. We’re working to make it easier for you to build and maintain secure apps for Atlassian products. In this session, Engineering Team Lead Dugald Morrow and Principal Product Manager Joël Kalmanowicz will explain how security and trust have been baked into the Forge framework and the benefits the platform can offer you and your users. Learn how much less work it can be to build trusted apps customers will love on Forge by going deep on the safeguards we’re putting in place. Developers or attendees with some software security experience will get the most out of this session.

Designing Forge UI: A Story of Designing an App UI SystemAtlassian

Creating apps with Forge and its UI frontend components is now easier than ever. Join Senior Designer Allard van Helbergen and Product Manager Josephine Lee as they walk through the story of designing Forge UI. What is a declarative UI and why did we choose this paradigm? What are all the considerations that go into defining the set of components to build apps with? And how do you make ‘creating apps’ simple? Walk away understanding the foundations of Forge, how all the different components work together, and where Forge UI is headed in the future.

Forge: Under the HoodAtlassian

After a day of learning about the exciting features of Forge, get ready for a peek under the hood to discover how it’s all implemented. Join Forge Architect Patrick Streule as he goes deep on topics such as Forge FaaS infrastructure, the internal workings of tenant isolation, and automatic authentication. Attendees will also get a glimpse of some features we’re looking at building into the future of Forge, such as a serverless data store for apps and more!

Access to User Activities - Activity Platform APIsAtlassian

How do you stay on top of your work when it is scattered across multiple Atlassian products? "If only there was a single place where I could see all my activity..." - sounds familiar? We are going to provide you an insight into what lead to the creation of a new Activity API. Following last year’s Atlas Camp announcement from our CTO Sri Viswanath, Atlassian is moving onto GraphQL - new Activity API is one the first pieces of the GraphQL Atlassian Platform and is the technology behind start.atlassian.com. Join Sergey Meshkov, Senior Developer, who will provide you a sneak peek of the new GraphQL Activity API as it will soon be available to our vendors.

Design Your Next App with the Atlassian Vendor Sketch PluginAtlassian

Our designers work  3x quicker  with the Atlassian Vendor Sketch Plugin — and now we’re unleashing these superpowers to the Atlassian Ecosystem. If you mockup screens for code or marketing, we’ll help you drag and drop your way to an Atlaskit design in less than 10 minutes. And if you’re a designer, you’ll want to hear about our pixel-perfect component library and suite of seamless Sketch integrations. Join Atlassian’s resident Sketch aficionado, Huw Evans, to learn about:  Sketch Components: If it’s in Atlaskit, it’s now in Sketch. And introducing the Symbol Palette, the quickest way to find the right component for the job.  Product Templates: Spark inspiration by building your designs inside realistic screens from Jira & Confluence — or craft hero images for your Marketplace listing!  Color and Text Styles: Heard of N75? H400? If those mean nothing to you, we’ll run through how to make your users feel at home by using Atlassian colors & typography, right inside Sketch.  Data Suppliers: Say goodbye to Lorem Ipsum. Learn how to use Sketch Data Suppliers to generate realistic copy using live data from Jira, Confluence and Bitbucket. Bonus: How we used AI to create people who don’t exist! ‍♀️ It's All Open Source: How we made it really easy to customise the Atlassian Vendor Sketch Plugin for your team's needs.

Tear Up Your Roadmap and Get Out of the BuildingAtlassian

The document discusses conducting customer research by tearing up existing roadmaps and getting out of the building. It recommends running a research spike with the team to define what needs to be learned. Tips are provided for recruiting participants through support, community, and sales teams. Conducting customer interviews is discussed, including roles for scribes and interviewers. Analyzing interviews by consolidating themes from transcripts is also covered. An example analysis identified themes around customer journeys, collaboration as a team sport, and overwhelming demand for participation. The document encourages being honest about whether a research spike could be run and why or why not.

Nailing Measurement: a Framework for Measuring Metrics that MatterAtlassian

When it comes to designing apps and new features, we just can't get enough of metrics. In an age where we can collect data from almost anything, how can we cut through the noise and focus on the right metrics to measure the success and failures of the apps that we’re building? Join Atlassian Product Manager Josephine Lee as she delves through what exactly makes a good metric. Throughout the talk, we’ll walk through real Atlassian examples of good and bad metrics. By exploring a framework for measurement, we’ll cover detailed features that showcase how best to measure and choose the right set of success, supportive, and counter metrics. You'll walk away with tips and learnings from Atlassian’s approach to measuring success, and learn how to use data and metrics to inspire action in your apps.

Building Apps With Color Blind Users in MindAtlassian

Color-blind people are using your apps. 1 in 12 men is color blind. And for women, this is 1 in 200. Building apps that work well for color blind people is not difficult. Some simple techniques help us with the design of our interface. And some tools help us see what color blind people see. In this talk, Maarten Arts of Avisi will look at common varieties of color blindness. We will look at apps through the eyes of a color-blind person. And we will discover what color-blind people struggle with. Regardless of whether you're a designer or developer, this talk will equip you with the skills and the tools you need to make sure that your app works for color-blind people.

Creating Inclusive Experiences: Balancing Personality and Accessibility in UX...Atlassian

The words we choose have the power to include or alienate our users. The reality is that for many, English is spoken as a second language. And unless you're going to localize your product for those major non-English speaking markets, you'll need to thoughtfully create content that is accessible to a larger audience. But how do we create products that maintain a sense of personality without isolating a wide audience of non-native speakers? Join Atlassian Content Designer, Roana Bilia, as she walks you through why thoughtful, inclusive content, is key to creating well-designed user experiences. You'll walk away with foundational principles for good UX copy when optimizing your product UI, a few quick wins that you as creators and developers can incorporate into your next products, as well as a set of mistakes to avoid that companies—including Atlassian—have made, which prioritized native speakers but isolated non-native speakers.

Beyond Diversity: A Guide to Building Balanced TeamsAtlassian

We hear it all the time, and we get it. Diversity and inclusion are important! But isn't it an HR problem? HR may be able to help with diversity but inclusion or creating an inclusive environment is everyone's responsibility. So how do we create an inclusive environment that celebrates diversity and engages and supports everyone? Isabel Nyo will be sharing best practices and lessons she has learned along the way. She will also be sharing her experience as a minority, a female technical leader, in the technology industry.

The Road(map) to Las Vegas - The Story of an Emerging Self-Managed TeamAtlassian

In September 2018, K15t took its mission to go self-managed to the next-level when the entire company worked together to decide on the Next Big Thing™ to build for Atlassian users and present it at Summit in Las Vegas. In this session, Anshuman Dash, an intern turned software engineer, turned product manager, shares his journey of professional self-discovery. In under five months, he joins a freshly assembled, self-managed team in building a new Atlassian Marketplace app. Dash will give a quick intro to what it means for a team to be self-managed. Then, he'll share his observations and experiences on the team, as well as the best-practices, patterns, and processes K15t has discovered along the way. Whether you are a new team with a kick-ass product idea or a big company figuring out ways to scale, this talk will provide you with practical tips and ideas your team can try out!

Building Apps With Enterprise in MindAtlassian

Designing for the enterprise comes with a unique set of challenges; ensuring readability and accessibility at scale, meeting the needs of multi-layered organizations, and building a trust when your software - used by dozens of thousands of employees - is considered mission-critical. At Atlassian, we've spent countless hours digging deep into our enterprise customer's needs and we've gathered a vast repository of insights. In this talk, Pawel Wodkowski, a senior designer on Jira Server, will share all that we've learned from our research (while not being shy about busting some of those wild admin myths!). You'll get a crash course in what it means to design for scale the Atlassian way.

International Women's Day 2020Atlassian

10 emerging trends that will unbreak your workplace in 2020Atlassian

Forge App ShowcaseAtlassian

Let's Build an Editor Macro with Forge UIAtlassian

Meet the Forge RuntimeAtlassian

Forge UI: A New Way to Customize the Atlassian User ExperienceAtlassian

Take Action with Forge TriggersAtlassian

Observability and Troubleshooting in ForgeAtlassian

Trusted by Default: The Forge Security & Privacy ModelAtlassian

Designing Forge UI: A Story of Designing an App UI SystemAtlassian

Forge: Under the HoodAtlassian

Access to User Activities - Activity Platform APIsAtlassian

Design Your Next App with the Atlassian Vendor Sketch PluginAtlassian

Tear Up Your Roadmap and Get Out of the BuildingAtlassian

Nailing Measurement: a Framework for Measuring Metrics that MatterAtlassian

Building Apps With Color Blind Users in MindAtlassian

Creating Inclusive Experiences: Balancing Personality and Accessibility in UX...Atlassian

Beyond Diversity: A Guide to Building Balanced TeamsAtlassian

The Road(map) to Las Vegas - The Story of an Emerging Self-Managed TeamAtlassian

Building Apps With Enterprise in MindAtlassian

Recently uploaded (20)

Role of Data Annotation Services in AI-Powered ManufacturingAndrew Leo

Electronic_Mail_Attacks-1-35.pdf by xploitniftliyevhuseyn

Increasing Retail Store Efficiency How can Planograms Save Time and Money.pptxAnoop Ashok

Generative Artificial Intelligence (GenAI) in BusinessDr. Tathagat Varma

AI Changes Everything – Talk at Cardiff Metropolitan University, 29th April 2...Alan Dix

Talk at the final event of Data Fusion Dynamics: A Collaborative UK-Saudi Initiative in Cybersecurity and Artificial Intelligence funded by the British Council UK-Saudi Challenge Fund 2024, Cardiff Metropolitan University, 29th April 2025 https://alandix.com/academic/talks/CMet2025-AI-Changes-Everything/ Is AI just another technology, or does it fundamentally change the way we live and think? Every technology has a direct impact with micro-ethical consequences, some good, some bad. However more profound are the ways in which some technologies reshape the very fabric of society with macro-ethical impacts. The invention of the stirrup revolutionised mounted combat, but as a side effect gave rise to the feudal system, which still shapes politics today. The internal combustion engine offers personal freedom and creates pollution, but has also transformed the nature of urban planning and international trade. When we look at AI the micro-ethical issues, such as bias, are most obvious, but the macro-ethical challenges may be greater. At a micro-ethical level AI has the potential to deepen social, ethnic and gender bias, issues I have warned about since the early 1990s! It is also being used increasingly on the battlefield. However, it also offers amazing opportunities in health and educations, as the recent Nobel prizes for the developers of AlphaFold illustrate. More radically, the need to encode ethics acts as a mirror to surface essential ethical problems and conflicts. At the macro-ethical level, by the early 2000s digital technology had already begun to undermine sovereignty (e.g. gambling), market economics (through network effects and emergent monopolies), and the very meaning of money. Modern AI is the child of big data, big computation and ultimately big business, intensifying the inherent tendency of digital technology to concentrate power. AI is already unravelling the fundamentals of the social, political and economic world around us, but this is a world that needs radical reimagining to overcome the global environmental and human challenges that confront us. Our challenge is whether to let the threads fall as they may, or to use them to weave a better future.

2025-05-Q4-2024-Investor-Presentation.pptxSamuele Fogagnolo

Designing Low-Latency Systems with Rust and ScyllaDB: An Architectural Deep DiveScyllaDB

Want to learn practical tips for designing systems that can scale efficiently without compromising speed? Join us for a workshop where we’ll address these challenges head-on and explore how to architect low-latency systems using Rust. During this free interactive workshop oriented for developers, engineers, and architects, we’ll cover how Rust’s unique language features and the Tokio async runtime enable high-performance application development. As you explore key principles of designing low-latency systems with Rust, you will learn how to: - Create and compile a real-world app with Rust - Connect the application to ScyllaDB (NoSQL data store) - Negotiate tradeoffs related to data modeling and querying - Manage and monitor the database for consistently low latencies

Enhancing ICU Intelligence: How Our Functional Testing Enabled a Healthcare I...Impelsys Inc.

SAP Modernization: Maximizing the Value of Your SAP S/4HANA Migration.pdfPrecisely

#StandardsGoals for 2025: Standards & certification roundup - Tech Forum 2025BookNet Canada

Book industry standards are evolving rapidly. In the first part of this session, we’ll share an overview of key developments from 2024 and the early months of 2025. Then, BookNet’s resident standards expert, Tom Richardson, and CEO, Lauren Stewart, have a forward-looking conversation about what’s next. Link to recording, transcript, and accompanying resource: https://bnctechforum.ca/sessions/standardsgoals-for-2025-standards-certification-roundup/ Presented by BookNet Canada on May 6, 2025 with support from the Department of Canadian Heritage.

Big Data Analytics Quick Research Guide by Arthur MorganArthur Morgan

This is a Quick Research Guide (QRG). QRGs include the following: - A brief, high-level overview of the QRG topic. - A milestone timeline for the QRG topic. - Links to various free online resource materials to provide a deeper dive into the QRG topic. - Conclusion and a recommendation for at least two books available in the SJPL system on the QRG topic. QRGs planned for the series: - Artificial Intelligence QRG - Quantum Computing QRG - Big Data Analytics QRG - Spacecraft Guidance, Navigation & Control QRG (coming 2026) - UK Home Computing & The Birth of ARM QRG (coming 2027) Any questions or comments? - Please contact Arthur Morgan at [email protected]. 100% human made.

Into The Box Conference Keynote Day 1 (ITB2025)Ortus Solutions, Corp

Transcript: #StandardsGoals for 2025: Standards & certification roundup - Tec...BookNet Canada

Book industry standards are evolving rapidly. In the first part of this session, we’ll share an overview of key developments from 2024 and the early months of 2025. Then, BookNet’s resident standards expert, Tom Richardson, and CEO, Lauren Stewart, have a forward-looking conversation about what’s next. Link to recording, presentation slides, and accompanying resource: https://bnctechforum.ca/sessions/standardsgoals-for-2025-standards-certification-roundup/ Presented by BookNet Canada on May 6, 2025 with support from the Department of Canadian Heritage.

UiPath Community Berlin: Orchestrator API, Swagger, and Test Manager APIUiPathCommunity

Join this UiPath Community Berlin meetup to explore the Orchestrator API, Swagger interface, and the Test Manager API. Learn how to leverage these tools to streamline automation, enhance testing, and integrate more efficiently with UiPath. Perfect for developers, testers, and automation enthusiasts! 📕 Agenda Welcome & Introductions Orchestrator API Overview Exploring the Swagger Interface Test Manager API Highlights Streamlining Automation & Testing with APIs (Demo) Q&A and Open Discussion Perfect for developers, testers, and automation enthusiasts! 👉 Join our UiPath Community Berlin chapter: https://community.uipath.com/berlin/ This session streamed live on April 29, 2025, 18:00 CET. Check out all our upcoming UiPath Community sessions at https://community.uipath.com/events/.

Cybersecurity Identity and Access Solutions using Azure ADVICTOR MAESTRE RAMIREZ

IEDM 2024 Tutorial2_Advances in CMOS Technologies and Future Directions for C...organizerofv

Noah Loul Shares 5 Steps to Implement AI Agents for Maximum Business Efficien...Noah Loul

Artificial intelligence is changing how businesses operate. Companies are using AI agents to automate tasks, reduce time spent on repetitive work, and focus more on high-value activities. Noah Loul, an AI strategist and entrepreneur, has helped dozens of companies streamline their operations using smart automation. He believes AI agents aren't just tools—they're workers that take on repeatable tasks so your human team can focus on what matters. If you want to reduce time waste and increase output, AI agents are the next move.

Build Your Own Copilot & Agents For DevsBrian McKeiver

Massive Power Outage Hits Spain, Portugal, and France: Causes, Impact, and On...Aqusag Technologies

The Evolution of Meme Coins A New Era for Digital Currency ppt.pdfAbi john

Role of Data Annotation Services in AI-Powered ManufacturingAndrew Leo

Electronic_Mail_Attacks-1-35.pdf by xploitniftliyevhuseyn

Increasing Retail Store Efficiency How can Planograms Save Time and Money.pptxAnoop Ashok

Generative Artificial Intelligence (GenAI) in BusinessDr. Tathagat Varma

AI Changes Everything – Talk at Cardiff Metropolitan University, 29th April 2...Alan Dix

2025-05-Q4-2024-Investor-Presentation.pptxSamuele Fogagnolo

Designing Low-Latency Systems with Rust and ScyllaDB: An Architectural Deep DiveScyllaDB

Enhancing ICU Intelligence: How Our Functional Testing Enabled a Healthcare I...Impelsys Inc.

SAP Modernization: Maximizing the Value of Your SAP S/4HANA Migration.pdfPrecisely

#StandardsGoals for 2025: Standards & certification roundup - Tech Forum 2025BookNet Canada

Big Data Analytics Quick Research Guide by Arthur MorganArthur Morgan

Into The Box Conference Keynote Day 1 (ITB2025)Ortus Solutions, Corp

Transcript: #StandardsGoals for 2025: Standards & certification roundup - Tec...BookNet Canada

UiPath Community Berlin: Orchestrator API, Swagger, and Test Manager APIUiPathCommunity

Cybersecurity Identity and Access Solutions using Azure ADVICTOR MAESTRE RAMIREZ

IEDM 2024 Tutorial2_Advances in CMOS Technologies and Future Directions for C...organizerofv

Noah Loul Shares 5 Steps to Implement AI Agents for Maximum Business Efficien...Noah Loul

Build Your Own Copilot & Agents For DevsBrian McKeiver

Massive Power Outage Hits Spain, Portugal, and France: Causes, Impact, and On...Aqusag Technologies

The Evolution of Meme Coins A New Era for Digital Currency ppt.pdfAbi john

Git Ready! Workflows

2. Ready! Workﬂows

3. Question time at the end Submit your questions

4. Nicola Paolucci Developer Advocate / Git Evangelist @durdndurdn.comI come out nice in pictures, I know :-).

5. Cheap local branching Full local history Speed Staging area prominent in Open Source Huge community You heard has Feature based workﬂow 10x the speed of svn Distributed cryptographic integrity

6. ground breaking paradigm is ground breaking

7. Workﬂow building blocks

8. 1 Common Practices 2 3 Collaboration model We’ll cover how to choose: Branching model Continuous Integration4

9. Which collaboration model?1 Easy, right?

10. Fully decentralized Anarchy I do my thing I do my thing, too ANARCHY here’s mine, who tells john? look ma, a goat!

11. Blessed repository with Gatekeeper He is cool Gatekeeper To have your work accepted, talk to him

12. and Lieutenants Dictator long live the King! Lieutenants guard the King Blessed repository

13. Shared common repository we share “everything” luckily no goats here Centralised

14. atlassian.com/git More on Collaboration models

15. + = Centralized Enterprise

16. Centralized allows ﬁne grained ACLs Branch & Repo permissions

17. Integration with your Issue tracking and CI

18. Which branching model?2

19. Product Releases1 Continuous Delivery2 Two common Branching Models

20. for Product Releases2.1

21. One Central Repository1 One Branch per Feature One Branch per Bugﬁx 2 3 Time master feature branches PRJ-123-description

22. One Central Repository1 One Branch per Feature One Branch per Bugﬁx 2 3 Time master bugﬁx branch PRJ-123-bug-description

23. Stable Branches4 master is alpha / RC5 Pull Requests6 Before merges Long running Time master stable branch PRJ-345-bug-description bugﬁx 2.2

24. 2.2 for Continuous Delivery

25. master is in production1 staging is the next version new features oﬀ staging 2 3 with branch names like: username/ISSUE-KEY-summary promoted from staging, can receive hot-fixes

26. Common Practices3 turbo boost!

27. What is a Pull Request?

28. Hey I have some code I want to merge here, take a look? Low friction collaboration Pull Request I have some code here! Can I merge it here?

29. Single Repository vs Remote Forks

30. Complete visibility1 No per Dev remotes required KISS 2 3 Pros of a Single Repo All feature branches available

31. Forks Are Great too BTW

32. Every one has their remote repository With Forks Full remote copy, each has one Integrator, Gatekeeper, Tech Lead, etc.

33. Manage codebase maturity1 X department and 3rd parties Dev to Dev interactions 2 3 Read “Cross”

34. Continuous Integration4

35. What happens to CI with git?1 An explosion of branches2 3 Performance degradation of build sys

36. Building everything is expensive1 Automatically build stable and master2 3 Manually trigger feature branch builds

37. Less Friction and Automation5

38. Code Quality via pre-commit hooks

39. Branch from green builds

40. Automatic merges for the win!

41. Time master stable branch PRJ-345-bug-description bugﬁx 2.2 stable branch 2.1 Automatic MERGES!

42. Ripple merges1 Server side update hook2 3 Or tool support

44. In Conclusion: the recipe

45. Branching Model Adopt Git Practices Automation & CI setup Conclusions Product workflow Continuous delivery workflow Embrace PR Build automatically, but leave knobs! Single Repo or Forks Collaboration Model Centralized Hooks, hooks everywhere

46. Nicola Paolucci THANKS YOU FOR YOUR ATTENTION @durdndurdn.comShould I change the pic?

47. Git Repository Management for Enterprise Teams Free Git Code Hosting for Small Teams Free Git Desktop client for Mac or Windows Atlassian

Git Ready! Workflows

Recommended

More Related Content

What's hot (20)

Viewers also liked (20)

Similar to Git Ready! Workflows (20)

More from Atlassian (20)

Recently uploaded (20)

Git Ready! Workflows