=== Logan_ is now known as Guest22407
=== Logan__ is now known as Logan_
=== Logan__ is now known as Logan_
=== GeertJohan|afk is now known as GeertJohan
[07:22] <dholbach> good morning
[07:49] <iulian> Morning dholbach.
[07:49] <dholbach> hey iulian
[08:22] <eboy> What's the method for dealing with upstream changes in a git project? Say the local modifications need to stay there but uncommitted and still able to update from upstream.
[08:27] <eboy> s/uncommitted//
[08:29] <hrw> eboy: you can: 1. merge them and handle conflicts each time. 2. merge them and rebase each time. 3. use upstream and apply own patches during package build
[08:29] <hrw> eboy: 2nd is pain for other contributors as tree is smashed on every rebase
[08:32] <eboy> hrw: option 1 seems best. Normally are separate branches created for local commits? looking into the Merge-o-Matic tool now
[08:34] <eboy> I just want to understand the typical workflow
[08:35] <eboy> I guess Arch uses option 3
[08:39] <hrw> eboy: there are many packages in debian/ubuntu with 3rd option in use
[08:40] <hrw> it is easiest to work with upstream that way
[08:40] <hrw> in my opinion
[08:41] <hrw> eboy: notice that debian packaging consists of original source + debian packaging
[08:41] <hrw> which makes 3rd option best to provide clean split
[08:53] <eboy> hm i see
[09:07] <eboy> thanks i appreciate it
[09:07] <eboy> hrw: cheers :)
=== pete-woods1 is now known as pete-woods
[09:34] <sil2100> Hello
[09:37] <hrw> hej sil2100
[12:32] <tumbleweed> noooo, pypy looks like it timed out on armhf
[12:34] <mitya57> :(
[12:35] <tumbleweed> it's a regular occurrence. Just wastes a week of builder time...
=== dholbach_ is now known as dholbach
=== barry` is now known as barry
=== dholbach_ is now known as dholbach
=== cjohnston_ is now known as cjohnston
=== glebihan__ is now known as glebihan
=== nigelb_ is now known as nigelb