These are chat archives for eventum/eventum

1st
Dec 2015
do you receive launchpad bug tracker notifications otherwise?
Bryan Alsdorf
@balsdorf
Dec 01 2015 15:12
I used to but I don't anymore for some reason
Elan Ruusamäe
@glensc
Dec 01 2015 21:42
@balsdorf i suggest you rebase instead merging in development branches, or don't merge at all, resolve conflicts when merging to master
and sometimes doing rebase it even discards the merge commit
so can do after merge as well
Bryan Alsdorf
@balsdorf
Dec 01 2015 22:30
@glensc Alright, I'll do that going forward. I've never fully understood rebasing so I've stayed away from it
Elan Ruusamäe
@glensc
Dec 01 2015 22:30
rebase makes commits linear without merge commits
merge commits have two parents
but with feature branches, do not need to merge with master at all
i'm perfectly fine resolving conflicts when attempting to merge feature branch to master
so, start the dev branch whatever sha1 commit, and don't bother what is in master branch
git checkout -b feature-develop-develop; git commit; git commit; git push -u; git push
^- no merges needed at all!
so, if you didn't made that merge commit, i wouldn't ask to rebase
just merging a branch with itself has several merges, looks ugly and pointless
Bryan Alsdorf
@balsdorf
Dec 01 2015 22:40
makes sense
Elan Ruusamäe
@glensc
Dec 01 2015 22:41
and did you already know, that when you have created PR you can add or even completely replace commits in that PR? just need to commit to same branch (push -f to overwrite) where the PR was created against