merge

mgravell · mgravell · commit 14525eb6dbf0 · 2026-02-25T14:46:16.000Z
diff --git a/toys/StackExchange.Redis.Server/RedisServer.cs b/toys/StackExchange.Redis.Server/RedisServer.cs
@@ -432,12 +432,8 @@ StringBuilder AddHeader()
                     break;
             }
         }
-<<<<<<< marc/resp-reader
-        [RedisCommand(2, nameof(RedisCommand.MEMORY), "purge")]
-=======
 
-        [RedisCommand(2, "memory", "purge")]
->>>>>>> main
+        [RedisCommand(2, nameof(RedisCommand.MEMORY), "purge")]
         protected virtual TypedRedisValue MemoryPurge(RedisClient client, RedisRequest request)
         {
             GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced);

Original file line number	Diff line number	Diff line change
`@@ -432,12 +432,8 @@ StringBuilder AddHeader()`
`432`	`432`	`break;`
`433`	`433`	`}`
`434`	`434`	`}`
`435`		`-<<<<<<< marc/resp-reader`
`436`		`- [RedisCommand(2, nameof(RedisCommand.MEMORY), "purge")]`
`437`		`-=======`
`438`	`435`
`439`		`- [RedisCommand(2, "memory", "purge")]`
`440`		`->>>>>>> main`
	`436`	`+ [RedisCommand(2, nameof(RedisCommand.MEMORY), "purge")]`
`441`	`437`	`protected virtual TypedRedisValue MemoryPurge(RedisClient client, RedisRequest request)`
`442`	`438`	`{`
`443`	`439`	`GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced);`