diff --git a/.gitignore b/.gitignore
index b172c446553..21a07b8c040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,10 @@ __pycache__/
 *.swo
 *#
 
+# conflicts
+*.orig
+*.rej
+
 # QtCreator
 CMakeLists.txt.user