search

dobtco / dvl-core

Base styles for the DOBT View Layer.
https://design.dobt.co/
1 stars 1 forks source link

.input_sub #2

Closed ajb closed 9 years ago

ajb commented 10 years ago

It was committed in the payments branch of Screendoor, but due to various merging stuff, it has been removed. Should we add to forms.scss?

jrubenoff commented 9 years ago

Since the payments branch has been deleted from the repo, it appears that .input_sub has been permanently removed as well, at least as far as I can tell.

If we're going to maintain this merge strategy, maybe you could post the code you removed into the issue in the future?

ajb commented 9 years ago

There is a branch called payments-pre-rebase that contains the branch pre-rebase. I've been keeping the "pre-rebase" branches around for a couple weeks before deleting them permanently. If you'd like, we can figure out a permanent archiving strategy?

On Fri, Nov 14, 2014 at 2:22 AM, Josh Rubenoff notifications@github.com wrote:

Since the payments branch has been deleted from the repo, it appears that .input_sub has been permanently removed as well, at least as far as I can tell.

If we're going to maintain this merge strategy, maybe you could post the code you removed into the issue in the future?

— Reply to this email directly or view it on GitHub https://github.com/dobtco/dvl-core/issues/2#issuecomment-63019044.

Adam Becker 510.928.9111 @AdamJacobBecker

jrubenoff commented 9 years ago

Found it, thanks!

Don't need much extra process here... if you're removing styles I committed, pasting them into an issue like this one would be great. You could also check with me first.

ajb commented 9 years ago

Got it, I'll be careful to do so in the future. The issue with this merge in particular is that you committed styles to forms.scss in the payments branch, while master had removed forms.scss entirely. I'm good with making it the policy that "if you remove something during a rebase or a merge, paste it somewhere so it's not lost forever".