So how do they deal with merge conflicts in the file? I don't want people to constantly be having to fix their branches because the release notes file has conflicts from another merge.
Aaron Meurer On Thu, Jan 12, 2017 at 8:57 AM, Shekhar Prasad Rajak <[email protected]> wrote: > The > Files(https://github.com/pandas-dev/pandas/tree/master/doc/source/whatsnew) > are written by hand with the PR. Means whenever a bug is fixed PR author > must add the testcase for the bug, and also update the file. Similarly > whenever anything new features implemented. > > See this PR : > https://github.com/pandas-dev/pandas/commit/0fe491db358204544814aa2371fed4ea947532ab#diff-52364fb643114f3349390ad6bcf24d8fR286 > . This PR fix the issue : #15048 and same is updated in the file > (whatsnew/v0.20.0.txt) by the PR author. > > -- > Shekhar > > On Monday, 26 September 2016 22:43:16 UTC+5:30, Aaron Meurer wrote: >> >> Now that GSoC has wrapped up, we should start looking at doing a release. >> As a start, can people >> >> - Mark issues and pull requests that need to be completed before the >> release with the "SymPy 1.1" milestone >> >> - Update the release notes with changes that have been merged >> https://github.com/sympy/sympy/wiki/Release-Notes-for-1.1 >> >> Any help you can provide on the above two points (especially the release >> notes) would be greatly appreciated. >> >> Aaron Meurer > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at https://groups.google.com/group/sympy. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sympy/d1f76e72-c2bd-4801-ab09-f3d94b0f2785%40googlegroups.com. > > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/sympy. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAKgW%3D6LWKJsCkhM4hXBMoPV4q5GDTGOcrYPc94RYGNR8v8bhAg%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
