[CLOSED] ALF Automation

[core-ai-bot]

Issue by walfgithub
Monday Apr 14, 2014 at 16:47 GMT
Originally opened as adobe/brackets#7506

---

ALF created a pull request. Please pull this in.

---

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

[core-ai-bot]

Comment by redmunds
Monday Apr 14, 2014 at 17:46 GMT

---

Merging.

[core-ai-bot]

Comment by njx
Monday Apr 14, 2014 at 23:43 GMT

---

@redmunds It looks like this got merged directly into master, but we actually only want to merge these into release (and then merge release into master later). It's probably ok since there shouldn't be any conflicts when we re-merge (since the end result of both sets of changes is the same), but just fyi for the future.

[core-ai-bot]

Comment by redmunds
Monday Apr 14, 2014 at 23:48 GMT

---

I couldn't think of any reason to not go right into master, but I guess it could make resolving conflicts harder.

[core-ai-bot]

Comment by njx
Monday Apr 14, 2014 at 23:50 GMT

---

Yeah, it's mostly so we don't have duplicated commits in master.