This page is not created by, affiliated with, or supported by Slack Technologies, Inc.
2017-09-01
Channels
- # aleph (7)
- # bangalore-clj (1)
- # beginners (89)
- # boot (5)
- # clara (21)
- # cljs-dev (2)
- # cljsrn (57)
- # clojure (58)
- # clojure-austin (1)
- # clojure-conj (1)
- # clojure-italy (5)
- # clojure-losangeles (3)
- # clojure-russia (4)
- # clojure-sanfrancisco (4)
- # clojure-spec (31)
- # clojure-uk (67)
- # clojurebridge (4)
- # clojurescript (56)
- # cursive (92)
- # data-science (4)
- # datomic (15)
- # emacs (23)
- # events (1)
- # fulcro (121)
- # gorilla (2)
- # jobs-discuss (1)
- # juxt (1)
- # lambdaisland (6)
- # lumo (13)
- # off-topic (11)
- # om (1)
- # onyx (17)
- # overtone (5)
- # parinfer (9)
- # planck (3)
- # re-frame (21)
- # reagent (95)
- # ring-swagger (7)
- # spacemacs (58)
- # vim (13)
- # yada (2)
anyone knows whether it’s possible to customise cljr’s behaviour of cljr-clean-ns
so that it never attempts to remove unused imports ?
i’m running into the situation where it’s removing imports where i only use i.e. multimethod declarations, and no specific function calls
Yep. I do that kind of thing frequently. Want to describe your problem, or pair on it?
when I press, r i
while cursor being exactly how indicated it says: Proceed despite merge in rebase range
I think my problem is that it's not straight history, those commits are from a feature branch
Yeah, sounds right. So can you proceed anyway or does it stop you?
but not it shows bunch of commits that I don't expect, and at the end the log looks kinda screwed up (maybe)
Does the magit process buffer (`$`) help illuminate what's going on?
In general, I recommend dividing and conquering here: create a branch from HEAD^
(i.e. 4b874df6
). Then you just have to squash the top 3 commits on the branch. After that you can rebase or even cherry-pick your final commit (`Tian`-something) atop the squashed commit and push that new history up.
Sure, good luck! 👍 If you still run into problems (e.g. b/c of the merge commit), let me know.
I think my problem is that in my team instead of choosing one strategy: either "rebase all the way" or "merge all the time" we mix it and create tangled mess
Yeah, I could see that being problematic. FWIW I put a lot of thought into the git best practices at my company: https://github.com/RoleModel/BestPractices/
Thanks. The problem with "best practices" is that hard to make people follow them without slapping on their hands when they don't
True…people are the hardest problem in programming. 😉