Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changelog conflicts are a thing of the past .. [EDIT: in local git checkouts, not in github] #14098

Merged
merged 1 commit into from
Apr 24, 2020

Conversation

timotheecour
Copy link
Member

@timotheecour timotheecour commented Apr 24, 2020

/cc @Araq

CI failures unrelated

alternatives considered

the 1 file-per-changelog-entry can be tried if merge=union turns out bad

see also https://github.com/git/git/tree/master/Documentation/RelNotes (not quite same as 1-per-entry but git issues more frequent releases, ie patch releases, eg:

Documentation/RelNotes/2.25.0.txt
Documentation/RelNotes/2.25.1.txt
Documentation/RelNotes/2.25.2.txt
Documentation/RelNotes/2.25.3.txt

[EDIT] works locally, but not on github UI

this avoids merge conflicts in your local git client but not in github UI, as also noted in isaacs/github#487 (unlike gitlab which supports it
but whoever's merging the PR should be able to easily merge through "resolve conflict" in those cases; if not, a local rebase (which should give no conflict) + git push -f will fix it

@Araq
Copy link
Member

Araq commented Apr 24, 2020

Irrelevant CI failures, let's give it a try.

@Araq Araq merged commit f07f07e into nim-lang:devel Apr 24, 2020
@timotheecour timotheecour deleted the pr_avoid_changelog_conflicts branch April 24, 2020 07:47
@timotheecour
Copy link
Member Author

timotheecour commented Apr 24, 2020

first casuality: my own PR that i just rebased, causing undesired "silent" merge, see #13265 (comment) for context + recommendation. The idea is sound, but it needs to have changelog.md moved to changelogs/changelog_1_4.md (the earlier the better to avoid similar issues)

@timotheecour timotheecour mentioned this pull request Apr 24, 2020
1 task
narimiran pushed a commit that referenced this pull request Apr 25, 2020
narimiran pushed a commit that referenced this pull request Apr 25, 2020
@timotheecour
Copy link
Member Author

see added note above (works locally, but not on github UI); at least, conflicts only happen on merge, not on local client when they rebase to devel.
(see note for how to resolve UI conflict)

@timotheecour timotheecour changed the title changelog conflicts are a thing of the past changelog conflicts are a thing of the past .. [EDIT: in local git checkouts, not in github] Apr 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants