Job Title: Briefly describe an error from your past projects so you had recently completed or an error from the other projects which impress you. State the reason, impact of the the error and how do you find it.
Activity content: During the project development process, we use Git.oschina to develop together. Everything went well at first, but after pulling the same group of classmates ' code, the code didn't work and reported many errors. The error indicates that a conflict occurred. The cause of the conflict is: the group of students to upload their own configuration files, configuration files are different, resulting in conflicts. After unable to solve, ask the lab's seniors for help. Seniors will copy the configuration information to a local backup, synchronizing the configuration information on Git. , we removed the configuration file on git and completely solved the problem.
Software Testing Technology HW1