Git am patch_file_name

Source: Internet
Author: User

1. Find the patch that failed to be entered into the patch

You can find the failure information of the patch.

2. Reload the patch according to the index of the patch to merge the merged content. The conflicting parts are generated separately.

For example, if the index of the patch is 0023, you can find it in the. Git/rebase_apply directory. If the file in the case of a patch failure is arch/ARM/KVM/guest. C

Git apply. git/rebase_apply. git/rebase_apply/0023 -- reverse (after this operation, arch/ARM/KVM/guest is generated. c. rej file, which stores conflicting content)

3. use the editor to manually edit ARCH/ARM/KVM/guest. c. Set ARCH/ARM/KVM/guest. c. add the content in rej to arch/ARM/KVM/guest. C to resolve conflicts

4. Delete the generated conflict file

Rm ARCH/ARM/KVM/guest. C. rej

5. Add the modified file ARCH/ARM/KVM/guest. C to git so that it can be tracked by git.

Git add ARCH/ARM/KVM/guest. c

6. Continue to install the remaining patches.

Git am -- resolved

 

Git am patch_file_name

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.