search

famanson / spring-roll-demo

Demo site for Project Spring Roll
1 stars 0 forks source link

Search history #23

Open macduy opened 10 years ago

macduy commented 10 years ago

Implement search history and show it when the user first clicks on the search box.

famanson commented 10 years ago

this sounds very much like https://github.com/famanson/spring-roll-demo/tree/past_searches to me

macduy commented 10 years ago

Indeed, this is just to track the feature to completion.

famanson commented 10 years ago

@macduy you could have simply created a pull request ;) A pull request = an issue

macduy commented 10 years ago

I'll let @cuctacuctac handle the merge conflicts first

Hai On 2 Jun 2014 10:11, "famanson" notifications@github.com wrote:

@macduy https://github.com/macduy you could have simply created a pull request ;) A pull request = an issue

— Reply to this email directly or view it on GitHub https://github.com/famanson/spring-roll-demo/issues/23#issuecomment-44816255 .

cuctacuctac commented 10 years ago

I'll merge master into past_searches tonight

macduy commented 10 years ago

Thanks, let me know if you run into roadblocks.

Hai On 2 Jun 2014 12:21, "Nhung Tran" notifications@github.com wrote:

I'll merge master into past_searches tonight

— Reply to this email directly or view it on GitHub https://github.com/famanson/spring-roll-demo/issues/23#issuecomment-44825818 .

cuctacuctac commented 10 years ago

in a moment of stupidity, i deleted the wrong stuff while resolving conflicts. some kind souls who still have the angular code for pastSearch in your local repo (around line 50 or so on index.html), could you push(?) it onto github please?

famanson commented 10 years ago

@cuctacuctac the nice thing about having a version control system is that you never "lose" anything. Even if you deleted the code, as long as it has been committed, it is always there. I can see the delete here https://github.com/famanson/spring-roll-demo/compare/596d99f254...d2459a700c#diff-eacf331f0ffc35d4b482f1d15a887d3bL66, adding it back in a new commit and everything will be fine.

The simplest thing to do next time this happens is:

For more advanced use, I'd always use the terminal console :-/ but you can stick with the website and the Mac client this way for now

macduy commented 10 years ago

I'm kind of glad that you ran into this situation :) Being able to fix this is a great skill to have.

Hai On 3 Jun 2014 08:09, "famanson" notifications@github.com wrote:

@cuctacuctac https://github.com/cuctacuctac the nice thing about having a version control system is that you never "lose" anything. Even if you deleted the code, as long as it has been committed, it is always there.

The simplest way to do this is:

  • Go to the project site https://github.com/famanson/spring-roll-demo
  • On the branch button (top left of the project files box), pick your branch (past_searches)
  • Then right above it, there is a button showing the number of commits, click there
  • You'll see all of the commits so far, click on your last merge (button on the right with the hash number on it)
  • Find your delete, put it back in your code and commit/sync it again

For more advanced use, I'd always use the terminal console :-/ but you can stick with the website and the Mac client this way for now

— Reply to this email directly or view it on GitHub https://github.com/famanson/spring-roll-demo/issues/23#issuecomment-44926839 .

famanson commented 10 years ago

fry-merge

Food for thought