openstack
/
octavia
Code Issues Proposed changes

Add *.orig to .gitignore 

.orig files get generated by Git when a merge conflict happens. Nobody
should ever want to add those files to the Git tree. By including them
in .gitignore we prevent that those files get added by accident.

Change-Id: Ifff0a4a5f78e35ecd722ecdb15edd08347230842
(cherry picked from commit 54a778e8a5)
(cherry picked from commit b7fc5b10b2)
(cherry picked from commit 10042f76d6)
(cherry picked from commit c87ff96d0b)
(cherry picked from commit 9d1f7f67fe)
This commit is contained in:
Tom Weininger 2022-08-21 17:02:11 +02:00
parent b830001cfc
commit 9d34d73af8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,6 +34,7 @@ tempest.log
.eggs/
.ropeproject/
*.qcow2
*.orig
# Files created by releasenotes build
releasenotes/build