Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,293,831
Community Members
 
Community Events
165
Community Groups

Resolve conflicts in confluence page

While editing the confluence page i got notification saying Green is conflicts and red is removed and blue for formatting changed.

I want to keep what is in green as i had added quite a lot of stuff in the page. I can't see any button to save or merge the conflicts to current version. I dont want to lose my stuff. 

 

1 comment

Er, not quite.  You got told Green is added, not "conflicts".  (Conflicts would include green and red-removed)  This avoids the need to "merge".  Save what you have and then edit again, removing anything that was added that you don't like, and adding back anything that should not have been removed.

Comment

Log in or Sign up to comment
TAGS
Community showcase
Published in Confluence

Confluence: Where work and wellness meet

Feeling overwhelmed by the demands of work and life? With a 25% increase in the prevalence of anxiety and depression worldwide during the pandemic, for most of us, it’s a resounding yes . 🙋‍♀️ ...

768 views 5 21
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you