The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Resolve conflicts in confluence page

Bhuvi J
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
August 28, 2019

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 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
Nic Brough -Adaptavist-
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Champions.
September 18, 2019

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.

TAGS
AUG Leaders

Atlassian Community Events