Hi Dave,

We will need a NOTICE file for the notice you removed. Please add this to your pull request.

Thanks,
Peter

Ok thanks Peter.

On Thursday, September 20, 2012, Peter Thiess wrote:

Hi Dave,

We will need a NOTICE file for the notice you removed. Please add this to
your pull request.

Thanks,
Peter

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1696#issuecomment-8737870.

Added the NOTICE with all third party libs and their licenses

Oh and also added an awesome empty merge commit :)

Oh and also added an awesome empty merge commit :)

Good, you're following our existing style :)

(We'll get better about rebasing and keeping a clean commit history one of these days...)

What is with @GarthDB's commits? Did he try to convert the MIT license to SVG?

Probably

On Thursday, October 25, 2012, Adam Lehman wrote:

What is with @GarthDB https://github.com/GarthDB's commits? Did he try
to convert the MIT license to SVG?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1696#issuecomment-9802104.

Well.... i don't think I should merge this with the random commits from @GarthDB and @gruehle. How can I know those commits out of the pull request?

how did all those random commits get in there? They don't seem to correspond

Not sure, but it might be worth just trying to merge the branch with master manually (in a local repo), and then looking at the diffs to see if there are any diffs besides the license stuff. If so, then it's probably okay (though there might be some redundant commits).

If we want to really be clean, we could just cherry-pick Dave's commits.

I did a local test merge and everything is clean.

These are the commands I ran:

# From an up-to-date master branch
git checkout -b davejohnson/license
git pull https://github.com/davejohnson/brackets.git license
git diff master