irc.libera.chat #tryton log beginning Fri Jan 20 12:10:01 AM CET 2023 | ||
-!- cedk(~ced@gentoo/developer/cedk) has joined #tryton | 23:55 | |
-!- ChanServ changed mode/#tryton -> +o cedk | 23:55 | |
-!- mrichez(~Maxime@2a02:a03f:c2e8:f900:db7c:11fb:1fc6:3112) has joined #tryton | 06:06 | |
-!- tbruyere(~Thunderbi@mail.saluc.com) has joined #tryton | 07:09 | |
-!- rpit(~rpit@p200300c88f3ecb0015d0f7b88c543ca5.dip0.t-ipconnect.de) has joined #tryton | 07:12 | |
-!- acaubet(~Thunderbi@194.224.31.235) has joined #tryton | 07:38 | |
-!- springwurm(~springwur@5.104.149.54) has joined #tryton | 07:56 | |
-!- springwurm(~springwur@5.104.149.54) has joined #tryton | 07:56 | |
-!- cedk(~ced@gentoo/developer/cedk) has joined #tryton | 08:41 | |
-!- ChanServ changed mode/#tryton -> +o cedk | 08:41 | |
-!- nicoe(~nicoe@2a02:578:852a:c00:18c2:1aff:fef9:2b7f) has joined #tryton | 08:57 | |
-!- tbruyere(~Thunderbi@mail.saluc.com) has joined #tryton | 09:35 | |
-!- tbruyere(~Thunderbi@mail.saluc.com) has joined #tryton | 09:36 | |
-!- tbruyere(~Thunderbi@mail.saluc.com) has joined #tryton | 09:46 | |
-!- nicoe(~nicoe@2a02:2788:54:1ff:18c2:1aff:fef9:2b7f) has joined #tryton | 12:21 | |
-!- sharkcz(~sharkcz@85-71-161-19.rce.o2.cz) has joined #tryton | 12:38 | |
-!- springwurm(~springwur@5.104.149.54) has joined #tryton | 13:09 | |
-!- tbruyere1(~Thunderbi@mail.saluc.com) has joined #tryton | 13:45 | |
mrichez | hi, question about merge_request https://foss.heptapod.net/tryton/tryton/-/merge_requests/193 . I had to update 'purchase' and 'sale' modules. Should it be done in 2 different commits or both changes in one ? | 14:56 |
---|---|---|
cedk | mrichez: a single | 15:19 |
mrichez | cedk: ok, and when it is done, how to merge 2 commits in one ? | 15:21 |
cedk | mrichez: https://www.mercurial-scm.org/doc/evolution/evolve-faq.html#collapse-changesets-fold | 15:28 |
mrichez | cedk: yep j'ai vu, merci :-) | 15:28 |
mrichez | cedk: oups, thank you | 15:28 |
mrichez | cedk: https://heptapod.net/pages/quick-start-guide.html#rewriting-history | 15:31 |
-!- mrichez(~Maxime@2a02:a03f:c2e8:f900:db7c:11fb:1fc6:3112) has left #tryton | 17:36 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!