+1 suara
171 tampilan
  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:

Postingan lama - ditampilkan dalam bahasa aslinya
Paratext oleh [Expert]
(735 poin)

ditampilkan kembali | 171 tampilan

Silakan masuk atau daftar untuk menjawab pertanyaan ini.

Pertanyaan terkait

0 suara
0 jawaban 201 tampilan
empty empty empty empty empty empty
[Expert]
anon421222
735
bertanya Feb 23, 2017
0 suara
2 jawaban 393 tampilan
Setelah melakukan kirim/terima (send/receive) setelah salah satu penerjemah melakukan beberapa pekerjaan pada beberapa ... telah dibuat yang menyebabkan pesan konflik tersebut?
JohnBrownie 427 bertanya Mar 6, 2023
0 suara
0 jawaban 217 tampilan
Sementara proyek kami bekerja pada Modul Alkitab, kami sering mengalami konflik penggabungan (merge conflicts) pada buku ... ada sesuatu tentang sistem yang tidak saya pahami.
mnjames 1,9k bertanya Feb 5, 2022
0 suara
3 jawaban 495 tampilan
Kami menggunakan Paratext dalam tim terjemahan dengan Paratext live yang menghubungkan 4 komputer. Ada beberapa tempat ... ? Terima kasih atas masukan apa pun. anon110449
anon110449 114 bertanya Jun 17, 2021
0 suara
1 jawaban 442 tampilan
Di Paratext 9, saya melakukan send/receive. Menu Changes Sent and Received mengatakan bahwa saya memiliki 102 ... yang mengalami masalah ini? Terima kasih atas bantuan Anda.
anon070573 110 bertanya Agu 31, 2020
Welcome to Support Bible, where you can ask questions and receive answers from other members of the community.
I appeal to you, brothers and sisters, in the name of our Lord Jesus Christ, that all of you agree with one another in what you say and that there be no divisions among you, but that you be perfectly united in mind and thought.
1 Corinthians 1:10
3,079 pertanyaan
6,045 jawaban
5,708 komentar
2,046 pengguna