#tde-devs < 2023/06/15 >
[03:52]micheleC has joined
[05:46]micheleC: @denk and @SlavekB: let's discuss about tdebase#359 when you are both available online
[05:46]micheleC: currently I am not quite sure what we want and what we are trying to achieve in the PR
[06:50]denk: online
[07:14]micheleC: let's wait for Slavek
[07:15]micheleC: @denk: tqt3#76 is good, but we need to squash the commits first
[07:16]micheleC: do you want to do it or shall I do it?
[07:16]micheleC: it
[07:16]micheleC: it
[07:16]micheleC: it's an easy step
[07:17]micheleC: git rebase -i @~2
[07:17]micheleC: pick, fix
[07:17]micheleC: then you should have only one commit on top of master
[07:18]micheleC: git push -f origin HEAD
[07:18]micheleC has left (Kopete 0.12.7 : http://trinitydesktop.org)
[07:18]micheleC has joined
[07:22]denk: yesterday I did squash on #359, I hpe it's correct
[07:22]denk: *hope
[07:23]micheleC: give it a go and let see. check that the graph shows only one commit on top of master before you push
[07:26]denk: done, check it
[07:27]micheleC: it's good
[07:50]micheleC has left (Kopete 0.12.7 : http://trinitydesktop.org)
[07:50]micheleC has joined
[08:23]SlavekB has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[09:16]SlavekB has joined
[12:26]micheleC has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[16:21]SlavekB has quit (Quit: Kopete : https://trinitydesktop.org)
[22:25]SlavekB has joined

#tde-devs < 2023/06/15 >