When working with git flow, the localizable.strings file is always marked conflict if it has any change. But in fact there is no conflict.
Doese anyone have any solution?
thientf
Users receive reputation points by contributing quality content to the forums.
Posts include post and replies published on the forums.
Post authors can mark replies as Accepted to indicate successful solutions.
Apple Developer Forums admins can mark replies as Apple Recommended to indicate an approved solution