algorithm/leetcode-master
1
0
Fork 0
mirror of https://github.com/youngyangyang04/leetcode-master.git synced 2025-07-08 08:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

doc：《如何在Github上提交PR》文字缺少修改

Browse Source
This commit is contained in:
lizhuo
2024-06-24 18:43:39 +08:00
parent 05bc2cef6f
commit 5cb1a4c202
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
problems/qita/join.md
View File

@ -188,7 +188,7 @@ python代码
大家提交代码的热情太高了，我有时候根本处理不过来，但我必须当天处理完，否则第二天代码冲突会越来越多。
<div align="center"><img src='https://code-thinking-1253855093.file.myqcloud.com/pics/20210514091457392.png' width=500 alt=''></img></div>
一天晚分别有两位录友提交了 30多道 java代码，全部冲突，解决冲突处理的我脖子疼[哭]
一天晚上分别有两位录友提交了 30多道 java代码，全部冲突，解决冲突处理的我脖子疼[哭]
那么在处理冲突的时候 保留谁的代码，删点谁的代码呢？