Shall we create branches with ChangeLog.new and inst/NEWS.Rd ?

[eddelbuettel]

I really, really, really appreciate how everybody updates ChangeLog and NEWS. This workflow sort-of predates git, and it doesn't merge cleanly. I am wondering if we should make the 'snippets' that are added called ChangeLog.new and inst/NEWS.Rd.new? Or maybe our initials instead of new?

Mostly just thinking out loud here to find a better flow that conflicts less. Feel free to close, or yell at me for being old-fashioned with these files. It happened before... :-/

[jjallaire]

I think we should just deal with the merge conflicts as they occur (they
aren't that bad). Alternatively we could keep changes to NEWS and ChangeLog
out of our PRs and then update later but that feels like it would risk the
update never happening.

On Wed, Aug 3, 2016 at 8:07 AM, Dirk Eddelbuettel notifications@github.com
wrote:

I really, really, really appreciate how everybody updates ChangeLog and
NEWS. This workflow sort-of predates git, and it doesn't merge cleanly. I
am wondering if we should make the 'snippets' that are added called
ChangeLog.new and inst/NEWS.Rd.new? Or maybe our initials instead of new?

Mostly just thinking out loud here to find a better flow that conflicts
less. Feel free to close, or yell at me for being old-fashioned with these
files. It happened before... :-/

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#530, or mute the thread
https://github.com/notifications/unsubscribe-auth/AAGXx7MUbXft8XJsY7cuoaGa-mabSHpqks5qcISdgaJpZM4Jbl-y
.

[nathan-russell]

I haven't used either of these features, but according to here and here, it looks like adding a .gitattributes file and specifying something along the lines of ChangeLog merge=union and NEWS.Rd merge=union could potentially resolve the problem. Any thoughts on this?

[eddelbuettel]

@jjallaire Agreed. Thought about this more on the train, and my suggestion was stupid. Creates a need for .Rbuildignore and whatnot. Was thinking an alternative may be to keep it in the commit notes but that creates an effort for all new commits -- not just the few conflicting ones. What we have works.

@nathan-russell Most interesting -- that may be exactly what the doctor ordered and the patient needed. Ace. To be tested.