Skip to content

Reduce conflict on Misc/NEWS#212

Merged
methane merged 1 commit intopython:masterfrom
methane:news-merge
Feb 21, 2017
Merged

Reduce conflict on Misc/NEWS#212
methane merged 1 commit intopython:masterfrom
methane:news-merge

Conversation

@methane
Copy link
Member

@methane methane commented Feb 21, 2017

use "union" merge strategy for Misc/NEWS.

ref: http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/

@methane
Reduce conflict on Misc/NEWS.
80209a5 
use "union" merge strategy for Misc/NEWS.
berkerpeksag
berkerpeksag approved these changes Feb 21, 2017
View reviewed changes
Copy link
Member

@berkerpeksag berkerpeksag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice finding! :)

@methane methane merged commit 3f3d036 into python:master Feb 21, 2017
@methane methane deleted the news-merge branch February 21, 2017 09:17
@methane
Copy link
Member Author

methane commented Feb 21, 2017

I'll wait to backport it to maintenance branches, until we confirm it works fine on master branch.

@methane
Copy link
Member Author

methane commented Feb 27, 2017

ref: https://github.com/python/cpython/pull/209/files#r103190115

git cherry-pick picks up 4 entries, while cherry-picked commit only adds one entry.

Without this merge=union, git cherry-pick reports conflict. So we can remove
entries unintentionally merged.
But with this merge=union, git cherry-pick merges all entries without reporting any conflict.

We must not use this for maintenance branch.
Since we don't use cherry-pick on master branch, it's not so big problem for now.
But we must remove .gitattributes when 3.7 branch created.
Hopefully, we can remove it right after some tool to manage NEWS is introduced. (python/core-workflow#6)

methane added a commit to methane/cpython that referenced this pull request Mar 4, 2017
@methane
remove merge=union attribute for Misc/NEWS
0af5892 
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. pythonGH-212)
@methane methane mentioned this pull request Mar 4, 2017
Merged
methane added a commit that referenced this pull request Mar 4, 2017
@methane
remove merge=union attribute for Misc/NEWS (GH-460)
060d2d7 
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)
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Apr 4, 2017
@methane @Mariatta
remove merge=union attribute for Misc/NEWS (pythonGH-460)
4f00380 
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. pythonGH-212)
(cherry picked from commit 060d2d7)
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Apr 4, 2017
@methane @Mariatta
remove merge=union attribute for Misc/NEWS (pythonGH-460)
ac8cdab 
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. pythonGH-212)
jaraco pushed a commit that referenced this pull request Dec 2, 2022
@Mariatta
Revert cherry-picker to v.1.2.2 (#212)
05bcf80
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@berkerpeksag berkerpeksag berkerpeksag approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@methane @berkerpeksag @the-knights-who-say-ni