Lines Matching refs:merges

18 merges would be nearly impossible.  Some problems encountered by
19 maintainers result from a desire to avoid merges, while others come from
106 is not such a project; any rebasing of branches to avoid merges will, most
109 Subsystem maintainers find themselves having to do two types of merges:
138 While merges from downstream are common and unremarkable, merges from other
140 Such merges need to be carefully thought about and well justified, or
144 type of merge is often called a "back merge".  Back merges can help to make
149 Why is that?  Back merges will muddy the development history of your own
152 you are managing is stable and ready for upstream.  Frequent merges can
157 That said, back merges are occasionally required; when that happens, be
165 maintainer merges with the upstream in order to resolve merge conflicts
169 merge conflicts than unnecessary back merges.  Seeing the conflicts lets
170 him know where potential problem areas are.  He does a lot of merges (382
187 Another reason for doing merges of upstream or another subsystem tree is to