1 out of 1 hunk failed while using path from Git Repo to Perforce Repo

Can someone tell me what I'm doing wrong here and how to solve such problems?

GIT version: git version 2.6.3.windows.1
Patch Version: Patch for Windows 2.5.9

T

+4
source share
1 answer

I solved this problem using GIT to fix instead of using patch.exe (Patch for windows). I use the following command, changing the directory to the patch file, and it worked fine.

git apply mypatch.patch

To ignore spaces, you can also use the following command -

git apply --ignore-space-change --ignore-whitepsace --whilespace=nowarn mypatch.patch
+1
source

Source: https://habr.com/ru/post/1624344/


All Articles