Why the Change can be successfully merged when files contain Git conflicts?

47 views
Skip to first unread message

Z

unread,
Jan 21, 2026, 6:54:20 AMJan 21
to Repo and Gerrit Discussion
Hi,Bro:

     Gerrit version 3.12.2

      Why the Change can be successfully merged when files contain Git conflicts?

       And How to config that the conflicts must be solved the change can be merged?

Thanks.

Daniele Sassoli

unread,
Jan 28, 2026, 4:20:33 AMJan 28
to Repo and Gerrit Discussion
On Wednesday, 21 January 2026 at 11:54:20 UTC Z wrote:
Hi,Bro:

     Gerrit version 3.12.2

      Why the Change can be successfully merged when files contain Git conflicts?
 
Sounds like the issue was the fact that the change was both verified and approved despite the fact that it contained these issues.


       And How to config that the conflicts must be solved the change can be merged?
 
How did the change pass the automatic test suite and code-review despite these issue? 

Thanks.
Reply all
Reply to author
Forward
0 new messages