This page is not created by, affiliated with, or supported by Slack Technologies, Inc.
2015-08-12
Channels
- # admin-announcements (3)
- # announcements (1)
- # beginners (9)
- # boot (85)
- # bristol-clojurians (4)
- # cider (12)
- # cljs-dev (3)
- # clojure (91)
- # clojure-berlin (7)
- # clojure-dev (16)
- # clojure-italy (21)
- # clojure-russia (67)
- # clojure-spain (3)
- # clojure-uk (6)
- # clojurescript (139)
- # core-async (41)
- # cursive (7)
- # datomic (61)
- # editors (56)
- # events (16)
- # hoplon (11)
- # jobs (4)
- # ldnclj (14)
- # liberator (7)
- # off-topic (13)
- # om (5)
- # re-frame (22)
- # ring-swagger (27)
hello @bozhidar! I've added the commits to PR but I see This branch has conflicts that must be resolved message. Is it my responsibility to work around this, or you usually handle such issues by yourself? I just haven't been in such situation before..
zarkone: so on your repo, pull down the latest changes to CIDER main's master and merge your branch against the CIDER master branch whatever name that is
so on my repo I have the remote "upstream" for the official repo and use "origin" for my fork, so you'd check out whatever your working branch is, do a git fetch --all
, then git merge upstream/master
@zarkone: no the discussion will persist as long as you do a merge. if you rebase then yes the discussion can become dissociated from the changes you've made.
oh, yes, the merge just add one "Merge" commit, sure. ok then, thanks for helping. I just have not a lot experience with git + a few people in repo
meaning that after doing changes you should do git rebase -i origin/master
followed by git push -f