search

japacible / commission-me

Platform for commissioners and buyers to connect and finalize sales.
http://commissionme.herokuapp.com/
4 stars 3 forks source link

Development Branches, use them please #220

Closed Bejoty closed 11 years ago

Bejoty commented 11 years ago

I've been doing commissions feature development on the commissions development branch, since I thought that's what development branches were for. @jbrodhacker has been trying to merge the file to master, but there are zillions (possibly an exaggerated figure) of conflicts because there's been continued development with these files on master without hitting the dev branch first.

Is there a work flow thing I'm missing?

jbrodhacker commented 11 years ago

I believe the issue is more that people have been taking the master branch state as their basis for a new branch, rather than wip-commissions. That's okay for unrelated changes like messages, but when people do things like rename commissions-specific files, change the UI of commission views, etc. we end up getting two different versions of the file - the one that gets pushed to master, and the one currently in wip-commissions. It would be easier if either a. people worked off wip-commissions instead or b. pushed their changes to both master and wip-commissions. Merge conflicts will happen with option b, but at least they won't pile up and be left to one individual who knows doesn't know your code as well as you do.

Bejoty commented 11 years ago

That. Thank you @jbrodhacker for making that clearer.

quanc commented 11 years ago

Hey @acouch00, it might be a good idea to add your HTML changes from master into the wip-commissions branch to make sure they're still there after Julie merges :)

jbrodhacker commented 11 years ago

Merge finished: please check over everything in wip-commissions to ensure that everything is functioning as expected :)

Bejoty commented 11 years ago

Awesome, almost all my code survived. A lot of the structure is changing today, so if anyone is planning to alter the UI or styling of this page, please consult me first! I'll be working on that JS file for a few more hours, but further updates will be on #222.

@kcorman, did your changes survive as well?

kcorman commented 11 years ago

Awesome, thanks for doing the merge! I think most of the conflicts were my fault. I actually didn't realize we were still using wip-commissions so when I made the javascript asset changes so I just put them in master. I'll use wip-commissions for commission changes in the future!

As for my changes surviving, it looks like they did! I should probably push an update to the commission-revision.js to move it into a partial like the other javascripts, but I'll do that later since it sounds like you're working on js stuff right now.

On Mon, Dec 2, 2013 at 12:59 PM, Austin Hedeen notifications@github.comwrote:

Awesome, almost all my code survived. A lot of the structure is changing today, so if anyone is planning to alter the UI or styling of this page, please consult me first! I'll be working on that JS file for a few more hours, but further updates will be on #222https://github.com/japacible/commission-me/issues/222 .

@kcorman https://github.com/kcorman, did your changes survive as well?

— Reply to this email directly or view it on GitHubhttps://github.com/japacible/commission-me/issues/220#issuecomment-29656828 .

Bejoty commented 11 years ago

I'll just be on the comm settings JS for a while, so now might actually be a good time to move other stuff around. I always pull when I start working and before pushing!

acouch00 commented 11 years ago

@quanc -- Popover is in wip-commissions.

Thanks a bunch, @jbrodhacker!

jbrodhacker commented 11 years ago

Glad to hear the merge seems to have gone over well :) Once I had gotten past the commission settings javascript merge, the rest of them weren't too bad.

quanc commented 11 years ago

@jbrodhacker already completed the merge successfully and it looks like everything survived, so I'm closing this.