/cpython

remove merge=union git attribute for Misc/NEWS #460

Merged
merged 1 commit into from Mar 4, 2017

Reviewers

@Mariatta Mariatta

Assignees

No one assigned

Labels

CLA signed

Projects

None yet

Milestone

No milestone

3 participants

@methane @Mariatta @the-knights-who-say-ni
@methane
Member
methane commented Mar 4, 2017

Github doesn't support it (ref. isaacs/github#487). So it can't ease
conflict on Github.

Additionally, it can make trouble when cherry-pick. (ref. GH-212)
@methane methane remove merge=union attribute for Misc/NEWS 
Github doesn't support it (ref. isaacs/github#487).  So it can't ease
conflict on Github.

Additionally, it can make trouble when cherry-pick. (ref. GH-212)

All checks have passed

2 successful checks
@codecov
codecov/patch — Coverage not affected when comparing cfcd767...0af5892
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
0af5892
@methane methane merged commit 060d2d7 into python:master Mar 4, 2017
2 checks passed

2 checks passed

codecov/patch Coverage not affected when comparing cfcd767...0af5892
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@methane methane deleted the methane:remove-merge-attribute branch Mar 4, 2017
@Mariatta Mariatta added a commit to Mariatta/cpython that referenced this pull request Apr 4, 2017
@methane @Mariatta methane + Mariatta remove merge=union attribute for Misc/NEWS (GH-460) 
Github doesn't support it (ref. isaacs/github#487).  So it can't ease
conflict on Github.

Additionally, it can make trouble when cherry-pick. (ref. GH-212)
(cherry picked from commit 060d2d7)
 4f00380
@Mariatta Mariatta added a commit to Mariatta/cpython that referenced this pull request Apr 4, 2017
@methane @Mariatta methane + Mariatta remove merge=union attribute for Misc/NEWS (GH-460) 
Github doesn't support it (ref. isaacs/github#487).  So it can't ease
conflict on Github.

Additionally, it can make trouble when cherry-pick. (ref. GH-212)
 ac8cdab
@Mariatta Mariatta added a commit that referenced this pull request Apr 4, 2017
@Mariatta Mariatta remove merge=union attribute for Misc/NEWS (GH-460) (GH-988) 
(cherry picked from commit 060d2d7)
 ce92be1
@Mariatta Mariatta added a commit that referenced this pull request Apr 4, 2017
@Mariatta Mariatta remove merge=union attribute for Misc/NEWS (GH-460) (GH-989) 
(cherry picked from commit 060d2d7)
 d7564e5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment