mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 08:02:36 +09:00 
			
		
		
		
	@@ -1764,6 +1764,7 @@ pulls.rebase_conflict_summary = Error Message
 | 
				
			|||||||
pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
 | 
					pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
 | 
				
			||||||
pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
 | 
					pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
 | 
				
			||||||
pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again.
 | 
					pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again.
 | 
				
			||||||
 | 
					pulls.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch.
 | 
				
			||||||
pulls.push_rejected = Merge Failed: The push was rejected. Review the Git Hooks for this repository.
 | 
					pulls.push_rejected = Merge Failed: The push was rejected. Review the Git Hooks for this repository.
 | 
				
			||||||
pulls.push_rejected_summary = Full Rejection Message
 | 
					pulls.push_rejected_summary = Full Rejection Message
 | 
				
			||||||
pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the Git Hooks for this repository
 | 
					pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the Git Hooks for this repository
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user