I hit an edit conflict and the merge was complicated. I decided the best thing to do was to get the changes between my version and the version I was originally changing, and then reapply those changes to the current version. But it appears there's no option to get my wikitext back intact; I can only get it in little pieces around where the edit conflicts are. -- ~~~~
Help talk:Paragraph-based Edit Conflict Interface/Flow
Appearance
Ah,I found a way to do this, but it was not where I expected. Normally the button to show changes or go back to the text you were editing is at the bottom of the form, near the "Preview" and "Publish" buttons. In the beta, it's actually next to the title of the revision, between the preview and the diff conflict resolution area.
+1 I had this exact issue. When an edit conflict ties the edit up into a dozen small sections to compare, it's best to just take my edits and piece it together myself. Usually it shows in the text box but with the new interface, it's hidden. I'd make this "(copy full text)" much more prominent.
You are not logged in. To receive attribution with your name instead of your IP address, you can log in or create an account.
By clicking "Reply", you agree to our Terms of Use and agree to irrevocably release your text under the CC BY-SA 4.0 License and GFDL.
Feature showed my addition with a check and an "X". I clicked the check. I then clicked "Show preview" and nothing happened. I then gave up.
Hey @Danbloch,
we tested the feature on deWiki and it worked. In order to solve your problem, could you please tell me which page you were trying to edit? And if possible also send a link to the diff of the change you were making? We will then try to solve your problem or figure out why it occurs and get back to you.
The page was en:Talk:Millennials. My change was en:Special:Diff/1169104213. The conflicting change was en:Special:Diff/1169102069/1169103055.
These both were additions at the same point in the file, so the conflicting change appeared first on the edit conflict page, followed by my change.
Hello @Danbloch,
thank you for the details and information. We have reconstructed your problem and indeed found that the interface seems to fail scrolling to the preview part when clicking the "Show Preview" button. Many thanks, for your awareness and your comment! We have created a Phabricator ticket to resolve the issue. You can also follow-up the next steps there.
You are not logged in. To receive attribution with your name instead of your IP address, you can log in or create an account.