avoid-conflicts

There are 2 repositories under avoid-conflicts topic.

wanadev/changelogify
A basic changelog manager made to avoid conflicts at git merge
Language:JavaScript7 6 254
escummy/vscode-settings-json
Advanced visual studio code settings json
4 1 02