fix: Show conflicting files for git apply or patch -p command

Modify the .gitignore file to display the conflicting files of git apply or patch -px.

Close #I3NNUS

Change-Id: I0ca0e312d0a83326e661d997181167e61b63e4b4

.gitignore

@@ -3,8 +3,6 @@
 *.a
 *.so
 *.swp
-*.rej
-*.orig
 
 # IDE settings
 .vscode