Lines Matching full:conflicts

18 merging branches, or resolving conflicts in their day-to-day work, so
20 resolving conflicts is a skill like any other, and there are many useful
44 you resolve conflicts with the help of git and any other conflict
61 in silent mistakes or messy conflicts).
86 Resolving conflicts
95 In general, conflicts appear when the context of the patch (i.e., the
128 -  `IntelliJ <https://www.jetbrains.com/help/idea/resolve-conflicts.html>`__
139 Most conflicts happen because the branch you are backporting to is
240 conflicts in a different file and don't want to do it again, you can
374 For particularly nasty conflicts with many conflict markers, you can use
534 file result in no conflicts, no compile-time errors, and runtime errors
541 cherry-pick the second patch, have no conflicts, and believe that
557 encountering conflicts, see e.g.
570   [ <summary of the conflicts and their resolutions> ]