{"action":"created","issue":{"url":"https://api.github.com/repos/Homebrew/homebrew/issues/42832","labels_url":"https://api.github.com/repos/Homebrew/homebrew/issues/42832/labels{/name}","comments_url":"https://api.github.com/repos/Homebrew/homebrew/issues/42832/comments","events_url":"https://api.github.com/repos/Homebrew/homebrew/issues/42832/events","html_url":"https://github.com/Homebrew/homebrew/issues/42832","id":100432901,"number":42832,"title":"Brew update error stashing local changes","user":{"login":"gojira","id":137710,"avatar_url":"https://avatars.githubusercontent.com/u/137710?v=3","gravatar_id":"","url":"https://api.github.com/users/gojira","html_url":"https://github.com/gojira","followers_url":"https://api.github.com/users/gojira/followers","following_url":"https://api.github.com/users/gojira/following{/other_user}","gists_url":"https://api.github.com/users/gojira/gists{/gist_id}","starred_url":"https://api.github.com/users/gojira/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gojira/subscriptions","organizations_url":"https://api.github.com/users/gojira/orgs","repos_url":"https://api.github.com/users/gojira/repos","events_url":"https://api.github.com/users/gojira/events{/privacy}","received_events_url":"https://api.github.com/users/gojira/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-08-11T23:20:31Z","updated_at":"2015-08-11T23:57:20Z","closed_at":"2015-08-11T23:57:20Z","body":"When I try to run brew update, git fails when trying to stash some local changes to boost python.\r\n\r\nThe current error output is this:\r\n\r\nStashing your changes:\r\nUU Library/Formula/boost-python.rb\r\nM  Library/Formula/boost.rb\r\nLibrary/Formula/boost-python.rb: needs merge\r\nLibrary/Formula/boost-python.rb: needs merge\r\nLibrary/Formula/boost-python.rb: unmerged (a8a8f42662cc139d215396a908318e21f60eb04f)\r\nLibrary/Formula/boost-python.rb: unmerged (d3610e6ea89642b0a5ff60a1d703ad37edf9cb02)\r\nLibrary/Formula/boost-python.rb: unmerged (b95ddc00ca404c12bb0479948d6873221ba9a09e)\r\nfatal: git-write-tree: error building trees\r\nCannot save the current index state\r\nError: Failure while executing: git stash save --include-untracked --quiet\r\n\r\n\r\nMy brew config and brew doctor output (both stdout & stderr) are in this gist: https://gist.github.com/gojira/4ece05518f5d59a71fe7\r\n\r\nMy setup includes the folllowing.\r\n1. Anaconda python distribution\r\n2. Caffe/CUDA/CUDNN which required changes to boost formula\r\n\r\nThank you."},"comment":{"url":"https://api.github.com/repos/Homebrew/homebrew/issues/comments/130115341","html_url":"https://github.com/Homebrew/homebrew/issues/42832#issuecomment-130115341","issue_url":"https://api.github.com/repos/Homebrew/homebrew/issues/42832","id":130115341,"user":{"login":"DomT4","id":6998367,"avatar_url":"https://avatars.githubusercontent.com/u/6998367?v=3","gravatar_id":"","url":"https://api.github.com/users/DomT4","html_url":"https://github.com/DomT4","followers_url":"https://api.github.com/users/DomT4/followers","following_url":"https://api.github.com/users/DomT4/following{/other_user}","gists_url":"https://api.github.com/users/DomT4/gists{/gist_id}","starred_url":"https://api.github.com/users/DomT4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DomT4/subscriptions","organizations_url":"https://api.github.com/users/DomT4/orgs","repos_url":"https://api.github.com/users/DomT4/repos","events_url":"https://api.github.com/users/DomT4/events{/privacy}","received_events_url":"https://api.github.com/users/DomT4/received_events","type":"User","site_admin":false},"created_at":"2015-08-11T23:57:20Z","updated_at":"2015-08-11T23:57:20Z","body":"`git fetch && git reset --hard origin/master` will sort you out. Note: Will overwrite whatever changes you've made to those formulae.\r\n\r\nSomeone with the same problem as you opened an issue the other day and to repeat what I said there if you need customised formula your best bet is to host your own custom tap and support the changes there.\r\n\r\nWriting changes to Homebrew formulae is a fairly solid way to ensure you run into merge problems or update problems at some point, as well as potentially discovering problems when you try to compile other Homebrew formulae against that customisation."}}