search

AdriaticOrg / code

Source code for features that covers local functionality.
1 stars 3 forks source link

.gitignore #9

Closed gregoral closed 6 years ago

gregoral commented 6 years ago

please add .gitignore to every branch if you don't already have one

.gitignore

out
node_modules
*.vsix
*.app
npm-debug.log
.alpackages
.vscode/*
!.vscode/launch.json.default
boych83 commented 6 years ago

We all will create our own branched xlf-file. This will also conflict every time when we'll try to merge branches. For now, I think we should also add the xlf-files in .gitignore.

maveca commented 6 years ago

But at the end we need those files. It's should behave same as code.

boych83 commented 6 years ago

Then we should at least arrange names for all xlf files that will have fixed names e.g. code.SLV.xlf,... Then only content will differ and be merged afterwards. It will be easier for merging.

maveca commented 6 years ago

This is for master Gregor. :)