level-up your
devops

All Resources

Webinars

91�� User Toolkit Episode 3: Conflict Resolution & Rollbacks

Webinars

5/12/2022

91�� User Toolkit Episode 3: Conflict Resolution & Rollbacks

The fastest relay team in the world won’t win Olympic Gold if they keep botching the baton transfer. In the same way, your development team won’t deliver digital gold if they keep stepping on each others’ toes and overwriting changes. To keep developers on the same page, the 91�� DevOps Platform has two collaborative solutions: Automated conflict resolution and rollback support.

Presentation Slides:

You'll Learn

Why merge conflicts happen (Spoiler: Git doesn’t play well with XML files)
How to leverage 91�� Auto Resolve (Based on selections and user story order)
When to use Online Conflict Resolution: Exclude specific file types from Auto Resolve
How to enable Rollback Support: Rollback changes across Salesforce metadata and nested components

‍

Your Speakers:

91�� Team

#1 DevOps Platform for Salesforce

We Build Unstoppable Teams By Equipping DevOps Professionals With The Platform, Tools And Training They Need To Make Release Days Obsolete. Work Smarter, Not Longer.

From Manual to Modern: A Practical Framework for Public Sector Teams to Scale Testing on Salesforce

From Innovation to Value Transforming Salesforce DevOps with 91�� AI

Webinars: Testing the Future: Ensuring Trust and Quality in Every Salesforce Experience

Release with Confidence: Mastering DevOps Automation with AXA Health

Revolutionizing Federal DevOps Practices with 91�� RPA

DevOps pour Salesforce et Tests Automatisés dopés à l'IA : là où vous en avez vraiment besoin

Maximizing Efficiency with 91�� AI: From Planning to Deployment | 91�� Webinar

Révolutionner DevOps pour les applications professionnelles et accélérer l'innovation

Webinars: Making DevOps Easier and Faster with AI

Learn How to Use the Easiest Salesforce Testing Solution: 91�� Explorer

Salesforce Migration Journey in China: Mastering Salesforce Deployment on Alibaba Cloud

L’automatisation des tests accessible à tous les utilisateurs de Salesforce

User Toolkit Webinar Episode 11: Harness the Power of Salesforce DX with Source Format Pipelines

91�� User Toolkit Episode 10: Profiles, Permission Sets & Other Pesky Salesforce Components

What’s New on the 91�� Platform? Ep. 2: The latest platform, CI/CD & Robotic Testing Innovations

91�� User Toolkit Episode 9 Tips and Tricks to Solve Script Failures

What’s New on the 91�� Platform? Ep 1 - The Latest in CI/CD, Robotic Testing & Quality Intelligence

What’s on the 91�� DevOps Exchange? Integrate Slack to Elevate Your DevOps Workflow with Centro

TDX23 Breakfast with Architects Panel Discussion

5 Tips to Being a Successful DevOps Consultant

In-Depth Review: How Does Git Work in a 91�� Repository?

Pull Requests and How to Conquer Them

A Developer’s Guide to Rollback with 91��

Architect Maintainable Data Templates with 91�� Data Deploy

Welcome / 91�� Champions Panel: Tales of Low-Code Innovation

Ask Me Anything About DevOps ROI Q&A with 91��'s Director of Business Value Management

91�� User Toolkit Episode 8: Leverage DevOps Analytics with Reports & Dashboards

What’s on the 91�� DevOps Exchange? Automate Code Reviews with Clayton

91�� User Toolkit Episode 7: How to Integrate Jira Cloud with 91��

Webinars: 5 Steps to Building a Salesforce Center of Excellence for Government Agencies

What’s on the 91�� DevOps Exchange? Practice DevSecOps with DigitSec

What’s the Fastest Way to Deploy Salesforce CPQ Data?

The Architect’s Guide to Salesforce Org Strategy

KnowBe4 and Back Promotions: Improving Training & Sandbox Consistency

Work Smarter, Not Harder: Test & Dev with Salesforce & 91��

2022 State of Salesforce DevOps Report: Top 4 Trends

91�� CI/CD for Salesforce (Second Generation)

91�� User Toolkit Episode 6: Best Practices for Upgrades

Admins At Scale: Zen Internet’s Low-Code DevOps Journey

How Cox Automotive Simplifies, Standardizes & Unifies Salesforce Orgs

91�� Fall 22 Release| Embed Quality into Salesforce Pipelines

Fall 22 Release | IBM: Optimize Efficiency with 91��’s Kanban Boards

91�� Fall 22 Release | Stop Breaking Salesforce: Try AI-Powered Test Automation

DevOps for Digital Banking: 2022 Trends & Stories - AmericanBanker Webinar

91�� User Toolkit - Episode 5: Cloud Deployment Best Practices

Five Steps to DevOps Success

91�� Webinar: Why Banks Can't Drive Digital Disruption Without Low-Code DevOps

91�� User Toolkit Episode 4 Quality + Testing Superpowers

Building Indestructible Software with Quality Driven Pipelines

Revenue Cloud Roundtable: Lessons Pitfalls and Best Practices

Salesforce DevOps Masterclass

91�� Robotic Testing Essentials: Affordable Automated Testing for Salesforce

91�� User Toolkit Episode 3: Conflict Resolution & Rollbacks

91�� User Toolkit Episode 2: Eliminate Merge Conflicts with Back Promotions

Maximize Revenue Cloud with low-code test automation

91�� Robotic Testing: Quality-Driven Testing for Salesforce and Beyond

91�� Community Day 2022: Don't Settle for Change Sets

91�� Community Day 2022: How To Solve Destructive Scenarios

91�� Community Day 2022: Accelerate MuleSoft Delivery with 91��

91�� Community Day 2022: How to Strengthen Security and Protect Yourself from Data Loss

91�� User Toolkit Episode 1: Powerful Pipeline

91�� Connecting the Clouds CRT Workshop AMER

Manufacturing + the DevOps Revolution: 2022 Trends and Transformations

State of Salesforce Testing: 2022 Survey Results Webinar

Salesforce DevOps: To Script or Not to Script?

Accelerate Your Public Sector Digital Transformation

How Pernod Ricard Uses DevOps to Drive Digital Transformation

Test Automation Analytics: 5 Questions Every Test Result should Answer

Test Automation 101: How to Create Scalable Test Scripts

AI Testing + DevOps: How to Optimize Test Automation

Forrester’s Total Economic Impact of 91�� DevOps | 91��

Humana’s Path to Success + Automating Change Management

Enabling DevSecOps in Digital Transformations

91�� Insights: How to become a DevOps Subject Matter Expert

How to Automate Compliance: Live Demo of 91�� Compliance Hub

Benchmarking Metrics that Matter

DevSecOps 101: DevOps + Compliance, Security and Testing

Optimize Salesforce Transformations with Value Stream Management

Insider Strategies to Drive Salesforce ROI

91�� Insights: Configuring 91�� Integrations with Salesforce Flow Builder.

Balancing Speed & Stability: Public Sector Panel

DevOps 360 — How Do You Measure Salesforce Delivery Success?

Leadership Track: Session 4 - Building the Business Case for Salesforce Devops

Go back to resources

There is no previous posts

Go back to resources

There is no next posts

Explore more about

CI/CD

Webinars

January 22, 2026

From Manual to Modern: A Practical Framework for Public Sector Teams to Scale Testing on Salesforce

Webinars

November 26, 2025

From Innovation to Value Transforming Salesforce DevOps with 91�� AI

Webinars

September 10, 2025

Webinars: Testing the Future: Ensuring Trust and Quality in Every Salesforce Experience

Webinars

July 2, 2025

Release with Confidence: Mastering DevOps Automation with AXA Health

Activate AI — Accelerate DevOps

Release Faster, Eliminate Risk, and Enjoy Your Work.
Try 91�� Devops.

Book a Consultation

Watch a Demo

Resources

Explore our DevOps resource library. Level up your Salesforce DevOps skills today.

Upcoming Events & Webinars

Learn More

E-Books and Whitepapers

Learn More

Support and Documentation

Demo Library

Learn More

91������

91������ User Toolkit Episode 3: Conflict Resolution & Rollbacks

Presentation Slides:

You'll Learn

Your Speakers:

Explore more about

Activate AI — Accelerate DevOps

Resources

Upcoming Events & Webinars

E-Books and Whitepapers

Support and Documentation

Demo Library

Join Our Upcoming Webinar

91��

91�� User Toolkit Episode 3: Conflict Resolution & Rollbacks