Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

ALF Automation#10957

Closed
walfgithub wants to merge 5 commits intoreleasefrom
alf_localization
Closed

ALF Automation#10957
walfgithub wants to merge 5 commits intoreleasefrom
alf_localization

Conversation

@walfgithub
Copy link
Copy Markdown
Contributor

Brackets: Please merge this pull request created by ALF. @ArturOledzki @pantkowiak @ybayer FYI

Comment thread package.json Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@walfgithub This bump up in version no is not required. Is this an automation error?

@peterflynn
Copy link
Copy Markdown
Member

I think we should close this start over with clean commits -- this pulls in part of the history of master which should not be on the release branch, but it's hidden from the diff because another commit reverts that history.

To see this, click on the first commit above (94b72f9), then click the "parent" link in the upper right. You'll see that the parent is 9264e29, which is the commit that changes version from 1.3 to 1.4 -- that commit should stay on master.

To fix this, ALF needs to start a new branch from scratch, branched off of release instead of master, then create a new commit with the changed files there.

@peterflynn
Copy link
Copy Markdown
Member

I think btw one problem with merging this as-is is that it would case problems when we later merge release back into master: since the commit that reverts 9264e29's diff is "past" 9264e29 in the history, it will essentially overrule 9264e29, and the version number on master would jump back to 1.3 after merging in the release branch. Fixing that would mean master gets 3 commits that bump up, revert, then bump up again the version number.

@nethip
Copy link
Copy Markdown
Contributor

nethip commented Apr 22, 2015

Closing this as we have already merged this. #10967

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants