Shulou(Shulou.com)06/02 Report--

Today, I will talk to you about the resolution of Git code conflicts in Android development. Many people may not know much about it. In order to make you understand better, the editor has summarized the following content for you. I hope you can get something according to this article.

If some configuration files in the system have been modified on the server, and then some new configuration items are added to the subsequent development,

When you release this configuration file, a code conflict occurs:

Error: Your local changes to the following files would be overwritten by merge:

Protected/config/main.php

Please, commit your changes or stash them before you can merge.

If you want to keep the changes made on the production server and just incorporate the new configuration items, do this as follows:

Git stashgit pullgit stash pop

You can then use the git diff-w + file name to confirm that the code is automatically merged.

Conversely, if you want to completely overwrite the local working version with the files in the code base. The methods are as follows:

Git reset-hardgit pull

Git reset is for version. If you want to roll back local changes to the file, use the

Git checkout HEAD file/to/restore

After reading the above, do you have any further understanding of the resolution of Git code conflicts in Android development? If you want to know more knowledge or related content, please follow the industry information channel, thank you for your support.

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.