Je was op zoek naar: conflict (Engels - Kinyarwanda)

conflict
ishyamirana ry' ingenzi

next conflict
kuri

previous conflict
guhindura>>

conflict color:
ibara::

go to next conflict
kuri

conflict in folder:
sync conflict resolution

a kaos binary conflict
a nyabibiri

go to next unsolved conflict
kuri

go to previous unsolved conflict
kuri

merge conflict, pda and local record swapped
gukomatanya na icyabitswe

archive and change conflict, local record sent to pda
na guhindura>> icyabitswe yoherejwe: kuri

archive and change conflict, pda and local record swapped
na guhindura>> na icyabitswe

the file has a & cvs; conflict and therefore cannot be committed.
idosiye a & cvs; na.

with only two input files every difference is also a conflict that must be solved manually.
kabiri iyinjiza idosiye buri ikinyuranyo/ itandukaniro ni a n' intoki.

merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied.
gusimbura ububiko idosiye in na: idosiye

this is shown if this file still has conflict markers in it. maybe you have previously updated the file and not resolved the conflicts.
ni niba iyi idosiye in. i idosiye na oya i.

when in auto-advance-mode this setting specifies how long to show the result of the selection before jumping to the next unsolved conflict.
in ikiyega - - ubwoko iyi igenamiterere birebire kuri herekana% s i igisubizo bya i ihitamo mbere kuri i ibikurikira >.

this is a special version of gnumeric. it has been compiled with support for a very large number of columns. access to the column named true may conflict with the constant of the same name. expect weirdness.
ni a bidasanzwe verisiyo bya gushigikira kugirango a binini umubare bya inkingi kuri gicurasi na: i bya i

!!! saving is disabled until all conflicts are resolved!!! (use the "go to prev/ next unsolved conflicts"-buttons to find the remaining conflicts.)
ni yahagaritswe & kugeza byose. (i kuri / ibikurikira > utubuto kuri gushaka i.)