search

pouchdb / pouchdb-fauxton

Fork of CouchDB Fauxton for PouchDB Server
Apache License 2.0
6 stars 7 forks source link

Merge with Fauxton master #7

Closed nolanlawson closed 9 years ago

nolanlawson commented 9 years ago

So basically I tried to do

git merge 9aafbd80e3a4545c292ca4c3251648fc0c80928a

But I found that there were too many merge conflicts. @nickcolley, it seems that notably there are a lot of conflicts where you added branding colors to fauxton.less, but those styles were refactored out into new less files and so now we need to apply the changes over again. :(

NickColley commented 9 years ago

I refactored those as all the colours were hardcoded in fauxton, I contributed it back upstream but I think potentially it's different.

Hopefully there's not much to redo with that in mind but happy to merge this for you.

NickColley commented 9 years ago

Had a proper look and it looks okay, I should be able to merge it successfully.

The main repo is using 'master' whereas we're using import-master. Any idea why we're not using the master branch?

nolanlawson commented 9 years ago

I think import-master was because this was forked from a GitHub repo that was mirrored from somewhere else.

NickColley commented 9 years ago

Can we make master the default branch?

nolanlawson commented 9 years ago

@nickcolley Sure, I think the whole import-master thing is an artifact of having forked a mirror of a non-Github repo.