search

mozilla / newtab-dev

Repo following gecko-dev for newtab development. No longer maintained.
Other
18 stars 10 forks source link

Fix search #18

Closed sarracini closed 9 years ago

sarracini commented 9 years ago

r? @marcoscaceres

marcoscaceres commented 9 years ago

Some legacy badness from the original search code, not too much... let's go through it on Tuesday and fix this up. Should not take long.

marcoscaceres commented 9 years ago

@sarracini, the commit history seems a bit strange... seems to contain old commits (though they don't show up in the diffs)?

marcoscaceres commented 9 years ago

@sarracini, @oyiptong did a breaking rebase on the master branch. It won't be possible to simply rebase this. I suggest we do the following:

  1. make a new branch.
  2. git cherry-pick 3a6540ca152fb8460a3a9891f76876dfd769fbaa
  3. Fix any issues (should not be significant... famous last words).
  4. git push origin newBranchName

That should get us back without any big rebase headaches.

marcoscaceres commented 9 years ago

oh, it also helps to:

  1. git checkout master
  2. git reset --hard origin/master
marcoscaceres commented 9 years ago

We moved this to branch fix_search_3