Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Add main.min.css and main.min.js to gitignore #154

Open
ATofighi opened this issue May 29, 2015 · 7 comments
Open

Add main.min.css and main.min.js to gitignore #154

ATofighi opened this issue May 29, 2015 · 7 comments

Comments

@ATofighi
Copy link
Contributor

We should add public/assets/css/main.min.css, public/assets/css/rtl.min.css, public/assets/js/main.js.min.map, public/assets/js/vendor.js.min.map, public/assets/js/main.min.js and public/assets/js/vendor.min.js to .gitignore...
these files make merge conflicts usually and we don't use them now... (https://github.com/mybb/mybb2/blob/master/resources/views/footer/footer.twig#L17-L18 & https://github.com/mybb/mybb2/blob/master/resources/views/partials/headerinclude.twig#L7,L9 )

@wpillar
Copy link
Contributor

wpillar commented May 30, 2015

👍 no compiled files should be committed to the repository imho.

@euantorano
Copy link
Member

The reason they were committed was so that not everybody would need node, bower, gulp etc set up.

On 30 May 2015, at 12:07, Will Pillar [email protected] wrote:

no compiled files should be committed to the repository imho.


Reply to this email directly or view it on GitHub.

@ATofighi
Copy link
Contributor Author

We use main.js and main.css and vendor.js now, minified files can make merge conflicts for now....

@wpillar
Copy link
Contributor

wpillar commented May 30, 2015

@euantorano when you say 'everybody' do you mean developers or users?

@euantorano
Copy link
Member

I mean developers and SQA team members. Not everybody needs to be able to do work on front end stuff.

On 30 May 2015, at 13:00, Will Pillar [email protected] wrote:

@euantorano when you say 'everybody' do you mean developers or users?


Reply to this email directly or view it on GitHub.

@wpillar
Copy link
Contributor

wpillar commented May 30, 2015

If we set it up properly, it would be no more difficult than:

git checkout <branch_name>
make build

Done. I'd rather that than the conflicts we have now to be honest.

@euantorano
Copy link
Member

True.

On 30 May 2015, at 13:16, Will Pillar [email protected] wrote:

If we set it up properly, it would be no more difficult than:

git checkout <branch_name>
make build
Done. I'd rather that than the conflicts we have now to be honest.


Reply to this email directly or view it on GitHub.

@wpillar wpillar self-assigned this Aug 23, 2015
@wpillar wpillar added this to the Alpha 1 milestone Aug 23, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

3 participants