Re: [boost] Extra file in boost serialization for 1.82.0

On Thu, May 11, 2023 at 9:20 PM Marshall Clow via Boost < boost@lists.boost.org> wrote:
Robert removed it from develop a while ago but it's still in master. Robert, your merges to master aren't removing the file, you need to fix your branches. Glen

On 5/11/23 6:45 PM, Glen Fernandes wrote:
There is a little more to it than this though. Some time ago I modified my usage of Git so that I have my development updates in the development branch - so far so good. But then I noticed that all the same information incremental files were repeated in the master branch. I found this redundant, repetitive and confusing. So I took to using "squash and merge" when incorporating the changes on the development branch. This option is available on GitHub. This seemed to give me what I wanted: a detailed history of development and a concise changes in the history of releases. It seems that something is awry here as the "squash & merge" option doesn't merge file deletions. When I catch up, I'll look into this.
Glen
-- Robert Ramey www.rrsd.com (805)569-3793
participants (2)
-
Glen Fernandes
-
Robert Ramey