[Webkit-unassigned] [Bug 205136] 2.26.2: build fails

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=205136

--- Comment #7 from Carlos Alberto Lopez Perez <clopez at igalia.com> ---
(In reply to Tomasz Kłoczko from comment #6)
> > What I suggest to do is simply to ignore the rejects on changelog files.
> 
> Issue is that git or patch command cannot do such things automatically.
> IMO if you are working in the team you should discuss that policy because it
> adds overhead to your work and it is kind of waster of time.
> Really .. git provides all what is necessary here :)

Some things you likely don't know:

1) WebKit development happens on SVN, not on git. The git repository is just a mirror of the SVN.
2) The tooling for WebKit development handles merging this changelogs automatically via a 3-way merge.

If you are interested in knowing more, a good place to start reading is https://webkit.org/contributing-code/

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20191212/bfc18410/attachment.htm>