четвер, 16 квітня 2020 р. 18:53:21 EEST ви написали: > I lost what I had added, but I had been working it up in Kate before I put > it online so I can mostly redo it again. > > But how do I properly deal with it if I ever run into it again? Is there a > wiki page that describes how it works?
Just overwrite with your version. English is a major version for all translations and the main purpose of UserBase is to deliver content in English which is occasionally translated into other languages. https://en.wikipedia.org/wiki/Help:Edit_conflict Best regards, Yuri > Cheers, > John > > On Thu, 16 Apr 2020, 10:35 am Yuri Chornoivan, <[email protected]> wrote: > > четвер, 16 квітня 2020 р. 18:31:16 EEST ви написали: > > > On 4/16/20 10:25 AM, Yuri Chornoivan wrote: > > > > четвер, 16 квітня 2020 р. 18:07:39 EEST John Hayes написано: > > > >> Can someone explain how to properly deal with a difference issue > > > >> while > > > >> editing a wiki page? I now know how not to do it. :( > > > >> > > > >> Cheers, > > > >> John > > > > > > > > Hi, > > > > > > > > Ermmm... What issue? Can you explain? > > > > > > > > Thanks in advance for your answers. > > > > > > > > Best regards, > > > > Yuri > > > > > > I had started on a git section for the vcs section, but stopped for a > > > day or so and then resumed editing. When I went to save the changes it > > > said that I had differences. It showed me what I had added on the left > > > and then some of the translation markers on the right, then I wrongly > > > hit save changes. > > > > > > Cheers, > > > John > > > > My bad. I had marked this page for translation in the meantime... > > > > You can save your changes forcefully. The translation system on UserBase > > is > > broken now (no automatic updates without Carl intervention), so no harm > > will > > be done. > > > > I should be more careful the next time. > > > > Best regards, > > Yuri
