How can two developers operate code on a remote branch at the same time?

how can two developers operate code on a remote branch at the same time

Aug.24,2021

first, then merge.


if you can communicate in advance, it is better to communicate, one as a reviewer first merges (and is responsible for resolving conflicts) the code of another person, and then submits it to the remote branch.

if people in the post-push cannot communicate due to various subtle reasons, they need to first Synchronize the remote code, resolve the conflict, and then submit it to the remote end. Either merge or rebase is fine here. See the team and recommend rebase.


deal with it in a collaborative manner

MySQL Query : SELECT * FROM `codeshelper`.`v9_news` WHERE status=99 AND catid='6' ORDER BY rand() LIMIT 5
MySQL Error : Disk full (/tmp/#sql-temptable-64f5-7bf963-1dd57.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
MySQL Errno : 1021
Message : Disk full (/tmp/#sql-temptable-64f5-7bf963-1dd57.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?