| === 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 | ||
| dholbach | good morning | 07:22 |
|---|---|---|
| iulian | Morning dholbach. | 07:49 |
| dholbach | hey iulian | 07:49 |
| 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:22 |
| eboy | s/uncommitted// | 08:27 |
| 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:29 |
| eboy | hrw: option 1 seems best. Normally are separate branches created for local commits? looking into the Merge-o-Matic tool now | 08:32 |
| eboy | I just want to understand the typical workflow | 08:34 |
| eboy | I guess Arch uses option 3 | 08:35 |
| hrw | eboy: there are many packages in debian/ubuntu with 3rd option in use | 08:39 |
| hrw | it is easiest to work with upstream that way | 08:40 |
| hrw | in my opinion | 08:40 |
| 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:41 |
| eboy | hm i see | 08:53 |
| eboy | thanks i appreciate it | 09:07 |
| eboy | hrw: cheers :) | 09:07 |
| === pete-woods1 is now known as pete-woods | ||
| sil2100 | Hello | 09:34 |
| hrw | hej sil2100 | 09:37 |
| tumbleweed | noooo, pypy looks like it timed out on armhf | 12:32 |
| mitya57 | :( | 12:34 |
| tumbleweed | it's a regular occurrence. Just wastes a week of builder time... | 12:35 |
| === 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 | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!