Tool: Figma Export
To export resources from Figma to Xcode/Android Studio.
"Outcomes, not output"
"Less but better"
"There is only one way to avoid criticism: do nothing, say nothing, and be nothing." — Aristotle
Good rule: for header and docs main question is - what/how? for comments in code - why?
Display "original" version from before the same area of the file was modified twice on different branches e.g. "original" version before conflict.
git config --global merge.conflictStyle diff3
To get a changes history between commits just use:
git log --pretty=oneline hash0...hash1 --no-merges --format=%s
where hash0 and hash1 - hashes of commits.
Add in "Build Phases" new "New Run Script Phase"
buildNumber=$(/usr/libexec/PlistBuddy -c "Print CFBundleVersion" "${PROJECT_DIR}/${INFOPLIST_FILE}")
buildNumber=$(($buildNumber + 1))
/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" "${PROJECT_DIR}/${INFOPLIST_FILE}"
In case of error in Localizable.string just use:
plutil -lint <your_strings_file>.strings