Open damiencorpataux opened 12 years ago
When merging project-features branches, certain files conflict by design and this shouldn't bother the user.
Eg.
Do this by creating and setting git merge driver(s). http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-s
When merging project-features branches, certain files conflict by design and this shouldn't bother the user.
Eg.
Do this by creating and setting git merge driver(s). http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-s