Databases
StackOverflow2013
Postsdbo
POgit patch apply leading to conflicts?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit patch apply leading to conflicts?
    primarykey
    data
    text
    <p>We need to upgrade the kernel for android from <code>&lt;REV1&gt;</code> to <code>&lt;REV2&gt;</code>.</p> <p>I am trying to generate a list of patches between two <code>&lt;REV1&gt;</code> and <code>&lt;REV2&gt;</code>. So I checked if both are on the same branch to get that list of patches using command</p> <pre><code>$git merge-base 69ecc39b5b4ea78de1f25bf9cbe7c236a91f764c af5ddc99f3d0e7c2406d5bf64763eef7d0843127 </code></pre> <p>and found that they are not on same branch. as I got the first common ancestor of <code>&lt;REV1&gt;</code> and <code>&lt;REV2&gt;</code> as c4b646ff80f558010ee486421ee1b718db1a3193</p> <p>So I tried to generate a list of patches between the common ancestor and <code>&lt;REV2&gt;</code> using </p> <pre><code>$git format-patch c4b646ff80f558010ee486421ee1b718db1a3193..af5ddc99f3d0e7c2406d5bf64763eef7d0843127 -o patch_JUN15_NOV26 </code></pre> <p>Now I created a new branch and reset that to common ancestor commit </p> <pre><code>$git reset --hard c4b646ff80f558010ee486421ee1b718db1a319 </code></pre> <p>Now I tried to patch the whole list of patches on this branch:</p> <pre><code>$git am --ignore-whitespace --reject ../../jb/kernel/patch_JUN15_APR10/* </code></pre> <p>But I got patch failed error asking me to resolve the conflicts for the first patch in the patchlist . But I expect no conflicts. My assumption is that if <code>&lt;REV1&gt;</code> and <code>&lt;REV2&gt;</code> are on the same branch, then the generated patch list from format-patch can be applied back on <code>&lt;REV1&gt;</code> smoothly without conflicts.</p> <p>Is my assumption correct? Am I doing it the right way?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USYossarian
    1. USkiran bobbu
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. POgit patch apply leading to conflicts?
      1. This table or related slice is empty.
      1. VTApproveEditSuggestion
    2. VO
      singulars
      1. POgit patch apply leading to conflicts?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POgit patch apply leading to conflicts?
      1. USVonC
      1. VTFavorite
    1. COWhy are you working with patch files? Is `git merge` not an option for you?
      singulars
      1. POgit patch apply leading to conflicts?
      1. USkrlmlr
    2. COIts a big repository . And I cant resolve all conflicts. Later point if we want to debug any issue , patch list will be very helpful to trace back the issue
      singulars
      1. POgit patch apply leading to conflicts?
      1. USkiran bobbu
    3. COThen perhaps rebase? With Git, you shouldn't really have to work with patch files anymore.
      singulars
      1. POgit patch apply leading to conflicts?
      1. USkrlmlr
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload