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
How to avoid “emotional overhead” at work (hint: emojis are 👍 )
Are you fluent in Gen Z’s “digital body language?”
How to excel at asynchronous communication with your distributed team
Say what you mean: how to become a more assertive communicator
More in Communication
-
Distributed Work
How to excel at asynchronous communication with your distributed team
RTO’d? Take these distributed practices back to the office with you
An intentional solution for worker loneliness
Atlassian’s distributed work glossary
More in Distributed Work
-
Leadership
Great managers meet uncertainty with curiosity and confidence
Good people management begins with self-understanding
How to minimize the impact of manager changes
Advice for first-time managers, from leaders who’ve been there
More in Leadership
-
Productivity
Everything you learned in school and forgot – all in one printable
Use divergent thinking to generate fresh ideas in your next brainstorm
How to use time-blocking to get more work done
Don’t underestimate the outsized impact of short-term goals
More in Productivity
-
Strategy
Less noise, more signal: Atlassian’s responsible AI journey continues
Find stuff fast: How to end the endless hunt for information
Atlassian’s approach on Enterprise strategy and planning
Control the chaos: a smarter approach to planning your work
More in Strategy
-
Teamwork
What’s your AI collaboration style? Take the quiz to find out!
95 AI prompts for better teamwork
AI is changing the way leaders lead and companies create
AI needs human partners to elevate its work – and keep it in check
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
