Force push my Asp.Net project

.gitignore

@@ -1,7 +1,15 @@
+<<<<<<< HEAD
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+=======
+# ---> VisualStudio
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+>>>>>>> a7abc2eea39052a6375a5d70fa8f3c8d06ca4de3
 
 # User-specific files
 *.rsuser
@@ -29,7 +37,10 @@ x86/
 bld/
 [Bb]in/
 [Oo]bj/
+<<<<<<< HEAD
 [Oo]ut/
+=======
+>>>>>>> a7abc2eea39052a6375a5d70fa8f3c8d06ca4de3
 [Ll]og/
 [Ll]ogs/
 
@@ -91,6 +102,10 @@ StyleCopReport.xml
 *.tmp_proj
 *_wpftmp.csproj
 *.log
+<<<<<<< HEAD
+=======
+*.tlog
+>>>>>>> a7abc2eea39052a6375a5d70fa8f3c8d06ca4de3
 *.vspscc
 *.vssscc
 .builds
@@ -294,6 +309,20 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+<<<<<<< HEAD
+=======
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+>>>>>>> a7abc2eea39052a6375a5d70fa8f3c8d06ca4de3
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -350,6 +379,12 @@ ASALocalRun/
 # Local History for Visual Studio
 .localhistory/
 
+<<<<<<< HEAD
+=======
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+>>>>>>> a7abc2eea39052a6375a5d70fa8f3c8d06ca4de3
 # BeatPulse healthcheck temp database
 healthchecksdb
 
@@ -360,4 +395,30 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+<<<<<<< HEAD
+FodyWeavers.xsd
+=======
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
+
+>>>>>>> a7abc2eea39052a6375a5d70fa8f3c8d06ca4de3