| 1 |
On Thu, 18 Sep 2014 19:39:08 +0200 |
| 2 |
Tobias Klausmann <klausman@g.o> wrote: |
| 3 |
|
| 4 |
> AIUI, we try to avoid merge conflicts, unless the merge is a |
| 5 |
> meaningful integration of divergent processes. |
| 6 |
> |
| 7 |
> However, one aspect of how ebuilds are written these days will |
| 8 |
> cause a non-trivial amount of merge commits that are not actually |
| 9 |
> useful in that sense. |
| 10 |
|
| 11 |
The concept of rebasing your commits has been invented for this. In the |
| 12 |
less common case that multiple people change the keywords, a manual |
| 13 |
three way merge is a breeze; taking into consideration that maintainers |
| 14 |
should be aware of KEYWORDS and other recent changes to their packages. |
Archives