I will upload it as a memorandum of programming learning.
Learn operational mistakes that cause conflicts Conflict When multiple people work on each branch and push to the master branch, if each edits the same file, A has an Index and there is no New B has no Index and there is a Newg. There is a situation where they do not match.
Learn how to resolve simple conflicts If you push the wrong information  Select Resolve conflict on the above screen Modify the code to what it should be Select Mark As Resolved Do each of the above. Precautions when a conflict occurs ・ Before starting work separately, hold a meeting and hold down the points that may cause conflicts in advance. -Pull the latest master branch information before starting work ・ Clarify why the conflict occurred ・ Do not resolve conflicts at your own discretion, but discuss with members to resolve them.
Understand how to use revert If you push the wrong information Comment information once pushed to the remote repository cannot be returned. Be careful to push. You can't go back, but you can delete commits in the remote repository. → Revert -Select the one you want to delete from the commit list in History and right-click Do "Revert Changes In commit" push Origin
If you comment the wrong information Before pushing, you can cancel the comment with Un do under comment
When working with multiple people, individual errors lead to overall errors. ・ Make sure that there are no errors when pushing or commenting. ・ If you make a mistake, resolve it with the correct procedure, and consult and report to the team members. ・ If you cannot solve the problem, consult with the members instead of trying to solve it in minutes.
Recommended Posts