Resolving conflicts with git-rerere
Resolving conflicts is never fun so you may as well use rerere to make fixing them easier, and even a bit fun.
Jeremy Greer
- Topics
-
Communication
Say what you mean: how to become a more assertive communicator
The subtle science of storytelling at work
New research: Write more clearly and become a super communicator
How to avoid “emotional overhead” at work (hint: emojis are 
)
More in Communication
-
Distributed Work
RTO’d? Take these distributed practices back to the office with you
An intentional solution for worker loneliness
Atlassian’s distributed work glossary
New research: better meetings start with a page
More in Distributed Work
-
Leadership
How to be a good mentor for your whole team
How to better support your team – without becoming their therapist
How to become a more connected leader
How to create a culture of continuous learning in the workplace
More in Leadership
-
Productivity
Team Playbook: Your AI teammate
How to take ownership of your work (and why you should)
To-do list trickledown: How to stay organized and keep your team on track
Quiz: Which time management strategy is right for you?
More in Productivity
-
Strategy
Organizational learning: an unsung hero of happier, more adaptable teams
The enterprising employee’s guide to “boomeranging”
From $0 to revenue in 6 months: How Uday Chakravarthi unlocked rapid startup growth at Clinch AGI
Getting started with generative AI
More in Strategy
-
Teamwork
How to apologize for a professional mistake – remotely or in person
10 expert tips for starting a new job
This is how effective teams navigate the decision-making process
How to politely correct someone when they’re wrong
More in Teamwork
-
Communication
- Collections
Earnings Reports“Open company, no bullshit” isn’t just one of our values. It’s a way of life at Atlassian. Here’s what we’re sharing with our investors and stakeholders each quarter.
Wellbeing | Well-doingLaying the groundwork for better employee health and happiness.
Company CultureEmbrace transparency, foster a sense of belonging, form connections – and have fun along the way.
Ways of WorkingHow you work is just as important as the work you’re doing.
Your Personality at WorkNavigating and celebrating the complexities of our individuality.
The Flywheel Growth ModelThere are loads of ways to grow a company – learn about our approach here. - Resources
- About
About Work Life
Work Life is Atlassian’s flagship publication dedicated to unleashing the potential of every team through real-life advice, inspiring stories, and thoughtful perspectives from leaders around the world.
Learn more about Work LifeContributors
