+1 voto
111 vistas
  1. From the Project menu, select Show Conflicts....
  2. In the Show Conflicts dialog, select the project that has the conflict and click OK.
    The Notes list window shows who made the changes that Paratext accepted.
  3. In the Notes list window, click Verse History.
  4. From one drop-down list in the View Verse History window, select Baseline.
    By default, the Baseline is displayed in the right pane.
  5. In the other drop-down list, select a version around the date and time of the merge conflict note.
    (If you hover over the date of an earlier version, the time when the earlier version was created is displayed in 24-hour notation with a Greenwich Mean Time offset).
    Repeat this step until you find the version where the rejected changes in the merge conflict note are in the text.
    In the drop-down list, the name to the right of the version shows who made the changes that were rejected.

:checkicon: The goal in finding out who made the changes that resulted in a merge conflict is to understand:

  • Why a merge conflict occurred.
  • Whether more merge conflicts are likely to occur.
  • Whether it is better to prevent merge conflicts (by changing permissions) or just fix merge conflicts when they occur.

:informationicon: See also:

Publicación antigua - se muestra en su idioma original
Paratext por [Expert]
(735 puntos)

mostrada de nuevo | 111 vistas

Por favor, inicie sesión o regístrese para responder a esta pregunta.

Preguntas relacionadas

0 votos
0 respuestas 127 vistas
empty empty empty empty empty empty
[Expert]
anon421222
735
preguntada feb 23, 2017
0 votos
2 respuestas 212 vistas
Having done a send/receive after one of the translators has done some work on some Psalms, I get two chapters ... changes have been made that are causing the conflict message?
JohnBrownie 385 preguntada mar 6, 2023
0 votos
0 respuestas 153 vistas
As our project works on a Bible Module, we're frequently getting merge conflicts in the XXC book. But the ... s something about the system that I'm simply not understanding.
mnjames 1,9k preguntada feb 5, 2022
0 votos
3 respuestas 279 vistas
We are using Paratext in a translation team with Paratext live connecting 4 computers. There are a few places where two ... they wouldn't have to? Thanks for any input. anon110449
anon110449 114 preguntada jun 17, 2021
0 votos
1 respuesta 257 vistas
In Paratext 9 I did a send/receive. The Changes Sent and Received menu said I had 102 conflicts from 2020-08-05 ... . Has anyone else had this problem? Thank you for your help.
anon070573 110 preguntada ago 31, 2020
Welcome to Support Bible, where you can ask questions and receive answers from other members of the community.
Very truly I tell you, whoever accepts anyone I send accepts me; and whoever accepts me accepts the one who sent me.
John 13:20
3,044 preguntas
6,004 respuestas
5,671 comentarios
2,026 usuarios