search

kenhkan / angular-curve

The Smoothest AngularJS Boilerplate
MIT License
11 stars 1 forks source link

Added a couple of angular bower dependencies #11

Closed ghost closed 10 years ago

kenhkan commented 10 years ago

I'd agree with all angular packages except the bootstrap-less library. The framework should take an opinionated way of development process, but not necessarily the technologies used. That's the spirit behind Brunch too. Also, the battle between Bootstrap and Foundation has yet to settle.

I have been employing with much success the strategy of updating angular-curve in the most foundational aspects of development and have forks or clones of it catering to a specific application environment and pulling changes as time goes on. How does that sound too you?

ghost commented 10 years ago

Sounds perfect. I'm just curious though, what's the best way to pull those changes without having 'merge' conflicts?

Cuz then, I can go by doing this my way (Regarding for instance the other pull request) while keeping myself in sync with you.

kenhkan commented 10 years ago

I usually apply the gitflow strategy for contributing PRs myself. The strategy is used for full-fledged development but in the context of PR, you always branch from origin/master (in this case, my master branch) for each feature, then you have your master branch that would merge all of these feature branches for your consumption. As changes are incorporated into origin/master you can then delete the feature branches.

And yes, in the end your master wouldn't be at the same point as origin/master but then you can simply do a rebase and everything should resolve perfectly unless you have some changes that are not incorporated into origin/master.

kenhkan commented 10 years ago

@tUrG0n Sorry. I'm going to close this PR because we want to stay lean when it comes to the run-time. When you develop a project by cloning this boilerplate you can then add what you need to it.