Update: pr 자동 머지 이슈 해결

Team-INSERT · Mar 26, 2024 · 657ee6a · 657ee6a
1 parent a133419
commit 657ee6a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/com/project/bumawiki/domain/docs/service/DocsUpdateService.java b/src/main/java/com/project/bumawiki/domain/docs/service/DocsUpdateService.java
@@ -42,9 +42,10 @@ public Long execute(String bearer, String title, DocsUpdateRequestDto docsUpdate
 		Docs foundDocs = findDocsByTitle(title);
 		validate(authId, foundDocs);
 
-		if (foundDocs.getStatus() == Status.CONFLICTED) {
-			throw new DocsConflictedException();
-		}
+		//TODO merge 왜 빨리 됐냐 ㄷㄷ
+		// if (foundDocs.getStatus() == Status.CONFLICTED) {
+		// 	throw new DocsConflictedException();
+		// }
 		VersionDocs savedVersionDocs = saveVersionDocs(docsUpdateRequestDto, foundDocs.getId(),
 			foundDocs.getLastVersion());
 		Docs docs;