On Thursday, January 12, 2017 at 6:45:00 PM UTC+1, Aaron Meurer wrote: > > So how do they [Pandas] 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. >
Vladimir Kiselev lists three options in a blog post [0]: a) Placeholders in the file. b) Setting the merge strategy "merge=union" for the changelog file in .gitattributes. c) Separate files per entry. It seems that Pandas does nothing of those yet. Interestingly, GitLab has tried a), then b), and is now at c). (See [0],[1],[2],[3].) [0] https://medium.com/@nettsundere/on-reducing-changelog-merge-conflicts-1eb23552630b#.sgoovezbz [1] "Use gitattribute merge=union to reduce CHANGELOG merge conflicts.", https://gitlab.com/gitlab-org/gitlab-ce/commit/4377ba1c360cf6f4d15e3b5ad2a7ed7bc41f795e [2] "Remove gitattribute entry for CHANGELOG.md", https://gitlab.com/gitlab-org/gitlab-ce/commit/59189438388191c044c0697d5bfb571693d95978 [3] https://gitlab.com/gitlab-org/gitlab-ce/tree/master/changelogs Maybe some of this works for you. -- Robert -- 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 sympy+unsubscr...@googlegroups.com. To post to this group, send email to sympy@googlegroups.com. 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/2af26bb0-d26a-4710-bc25-971b24085e2f%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
