Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

🏑 Atlympic Event: Confluence

Hello Community!  Quick disclaimer: We are running a contest on Community (The Atlympics!) from July 23rd - August 8th of 2021. If you are interested in participating in this contest (prizes! ...

211 views 6 8
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