Fork me on GitHub
#cider
<
2015-08-12
>
zarkone19:08:17

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..

arrdem19:08:15

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

arrdem19:08:57

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

zarkone19:08:17

@arrdem: thanks. i'm just afraid it will drop all the discussion, isn't it?

arrdem19:08:56

@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.

zarkone19:08:39

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 simple_smile

arrdem19:08:51

Sure no problem. Yeah you just have to merge and push that merge.

arrdem19:08:27

bozhidar: before he goes to all this effort are you a merge or rebase shop

bozhidar19:08:59

@zarkone: it’s also a preference of mine to squash all related commit together

bozhidar19:08:34

meaning that after doing changes you should do git rebase -i origin/master followed by git push -f

zarkone19:08:49

yes, i've got it -- other case, there would be too long commit history, as I understood. Especially with all this my typo commits.