diff --git a/.gitignore.BACKUP.5284.gitignore b/.gitignore.BACKUP.5284.gitignore
new file mode 100644
index 0000000..4592b2f
--- /dev/null
+++ b/.gitignore.BACKUP.5284.gitignore
@@ -0,0 +1,11 @@
+*.d
+*.o
+Release/*
+<<<<<<< HEAD
+!Release/RepRapFirmware.bin
+=======
+!Release/RepRapFirmware*.bin
+>>>>>>> duet
+*~
+*orig
+/Release
diff --git a/.gitignore.BASE.5284.gitignore b/.gitignore.BASE.5284.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/.gitignore.LOCAL.5284.gitignore b/.gitignore.LOCAL.5284.gitignore
new file mode 100644
index 0000000..fee10ee
--- /dev/null
+++ b/.gitignore.LOCAL.5284.gitignore
@@ -0,0 +1,7 @@
+*.d
+*.o
+Release/*
+!Release/RepRapFirmware.bin
+*~
+*orig
+/Release
diff --git a/.gitignore.REMOTE.5284.gitignore b/.gitignore.REMOTE.5284.gitignore
new file mode 100644
index 0000000..fccb4e4
--- /dev/null
+++ b/.gitignore.REMOTE.5284.gitignore
@@ -0,0 +1,7 @@
+*.d
+*.o
+Release/*
+!Release/RepRapFirmware*.bin
+*~
+*orig
+/Release