This page is not created by, affiliated with, or supported by Slack Technologies, Inc.
2015-12-06
Channels
- # admin-announcements (7)
- # beginners (37)
- # boot (36)
- # cider (8)
- # cljs-dev (16)
- # clojure (155)
- # clojure-hamburg (1)
- # clojure-russia (2)
- # clojurecup (21)
- # clojurescript (69)
- # clojurex (12)
- # core-async (2)
- # datavis (3)
- # datomic (5)
- # devcards (4)
- # events (2)
- # hoplon (15)
- # lein-figwheel (45)
- # off-topic (22)
- # om (77)
- # re-frame (8)
- # reagent (7)
- # slack-help (1)
O, I follow the book "Web development with Clojure" and there I have to use this : `[org.clojure/java.jdbc "0.2.3"] [org.xerial/sqlite-jdbc "3.7.2"]] `
Quick git
-question! I have a program that I completely rewrote. I want to keep 0 files from the master
branch, but keep everything in my rewrite
branch.
Now I'm about to merge these (in a github pull request). If I do git checkout master && git merge rewrite
, I will end up with a lot of garbage from master
I don't want to keep.
How can I merge, but have every file from master
removed and part of history? And master
will then be an exact copy of rewrite
@codemartin How about this: git checkout master && rm -rf * && git merge —no-ff rewrite
?
@roelof: SQLite can be run by just including it as a jar. It will store it's data on the file system or in memory, depending on the configuration. There is no "installation" needed.
@codemartin: just delete the master branch and rename rewrite to master?
@tberman that was my first thought as well but then he loses the history on master
@adamtrilling: depends on what rewrite is
@adamtrilling: if rewrite includes that history, then no
@codemartin will have to come back and tell us what his intentions were
@adamtrilling: Cool! I'll try that out right now
@codemartin: Keep in mind what @tberman said…if the rewrite
branch has all of the history you want, then his suggestion is better
@adamtrilling: @tberman Hmm yeah master has had only one commit during this time - updating the realm saying that code is dying. Think it's ok to keep
@tberman: @adamtrilling it worked great! Thank you fine people for helping me out on this Appreciate it
Yay! I’m glad to be helping instead of asking for once...