Documentation/process/backporting.rst

4 Backporting and conflict resolution
19 when a merge conflict does pop up, it can be daunting. Luckily,
25 backporting and conflict resolution.
43 destination tree, as this will make git output conflict markers and let
44 you resolve conflicts with the help of git and any other conflict
91     CONFLICT (content): Merge conflict
102 conflict that needs to be resolved.
104 If your attempted cherry-pick fails with a conflict, git automatically
105 edits the files to include so-called conflict markers showing you where
106 the conflict is and how the two branches have diverged. Resolving the
107 conflict typically means editing the end result in such a way that it
110 Resolving the conflict can be done either by hand in a regular text
111 editor or using a dedicated conflict resolution tool.
114 conflict directly, as it may be easier to understand what you're doing
144 applied to it that themselves needed conflict resolutions, causing a
148 conflict, as otherwise you cannot be confident in the correctness of
152 or pitfalls with your conflict resolution.
158 conflict -- this is usually sufficient when there aren't a lot of
167 (because that's where the conflict appears), you can use the following
198 one for a given conflict) is to run ``git blame``. In this case, you
200 cherry-picking and the file where the conflict appeared, i.e.::
210 Navigate to the place where the conflict occurred. The first column of
215 look like they might be the source of the conflict. Sometimes there will
217 changed different lines of the same conflict area *or* because multiple
226 Having found the patch that caused the conflict, you need to determine
247 Understanding conflict markers
254 patches and you just want to resolve the conflict. Git will have
255 inserted conflict markers into your file. Out of the box, this will look
276 When you are resolving a conflict, the behavior of ``git diff`` differs
311 because they are part of the merge conflict or the patch being
317 The default conflict marker style shown above is known as the ``merge``
331 this conflict style as it makes it much clearer what the patch actually
334 make better decisions about how to resolve the conflict.
336 To change conflict marker styles, you can use the following command::
342 been trimmed off, making the conflict area smaller in some cases.
346 Iterating on conflict resolutions
349 The first step in any conflict resolution process is to understand the
358 questions will inform your conflict resolution.
364 part of the conflict, leaving the file essentially unchanged, and apply
370 technique of manually applying changes is mostly useful if the conflict
374 For particularly nasty conflicts with many conflict markers, you can use
385 renamed, as that typically means git won't even put in conflict markers,
435 may not be part of the conflict even though could have been changed by
479 Having committed a conflict-free new patch, you can now compare your