I like to have a local offline version of browser-solidity on localhost. From now an then I want to update it to a newer version. Then disaster strikes
$ git status On branch gh-pages Your branch and 'origin/gh-pages' have diverged, and have 1 and 1 different commit each, respectively. (use "git pull" to merge the remote branch into yours) You have unmerged paths. (fix conflicts and run "git commit") Changes to be committed: new file: browser-solidity-478fe25.zip Unmerged paths: (use "git add <file>..." to mark resolution) both added: README.md both added: assets/css/universal-dapp.css both added: build/app.js both added: soljson.js
I virtually never touch that files, but they are always changed. Why is that?
Whats a good update solution?