[CLOSED] ALF Automation

[core-ai-bot]

Issue by walfgithub
Monday Apr 20, 2015 at 16:41 GMT
Originally opened as adobe/brackets#10957

---

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

---

walfgithub included the following code: https://github.com/adobe/brackets/pull/10957/commits

[core-ai-bot]

Comment by peterflynn
Tuesday Apr 21, 2015 at 21:39 GMT

---

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 9264e29c, 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.

[core-ai-bot]

Comment by peterflynn
Tuesday Apr 21, 2015 at 21:41 GMT

---

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.

[core-ai-bot]

Comment by nethip
Wednesday Apr 22, 2015 at 09:23 GMT

---

Closing this as we have already merged this. adobe/brackets#10967