{"action":"created","issue":{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/224","labels_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/224/labels{/name}","comments_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/224/comments","events_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/224/events","html_url":"https://github.com/petervanderdoes/gitflow-avh/issues/224","id":109880834,"number":224,"title":"feature finish fails if no changes to merge","user":{"login":"allancarter","id":5067419,"avatar_url":"https://avatars.githubusercontent.com/u/5067419?v=3","gravatar_id":"","url":"https://api.github.com/users/allancarter","html_url":"https://github.com/allancarter","followers_url":"https://api.github.com/users/allancarter/followers","following_url":"https://api.github.com/users/allancarter/following{/other_user}","gists_url":"https://api.github.com/users/allancarter/gists{/gist_id}","starred_url":"https://api.github.com/users/allancarter/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/allancarter/subscriptions","organizations_url":"https://api.github.com/users/allancarter/orgs","repos_url":"https://api.github.com/users/allancarter/repos","events_url":"https://api.github.com/users/allancarter/events{/privacy}","received_events_url":"https://api.github.com/users/allancarter/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-10-05T20:37:04Z","updated_at":"2015-11-13T07:41:32Z","closed_at":null,"body":"If I finish a branch with no changes I get the following error:\r\n\r\nSwitched to branch 'develop'\r\nYour branch is up-to-date with 'origin/develop'.\r\n (nothing to squash)Already up-to-date.\r\nOn branch develop\r\nYour branch is up-to-date with 'origin/develop'.\r\nnothing to commit, working directory clean\r\n\r\nThere were merge conflicts. To resolve the merge conflict manually, use:\r\n    git mergetool\r\n    git commit\r\n\r\nYou can then complete the finish by running it again:\r\n    git flow feature finish amc_test\r\n\r\nNote that there are NOT any merge conflicts.\r\n\r\nI know that this looks funny, but the usage model is that I want to run the commands on all submodules. So when I create a feature branch I want to branch the project and all of its submodules. When I finish it I want to finish the branches in all of the submodules. If the submodule had no commits then feature finish should just continue with no error."},"comment":{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/comments/156355301","html_url":"https://github.com/petervanderdoes/gitflow-avh/issues/224#issuecomment-156355301","issue_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/224","id":156355301,"user":{"login":"lgiordani","id":1675575,"avatar_url":"https://avatars.githubusercontent.com/u/1675575?v=3","gravatar_id":"","url":"https://api.github.com/users/lgiordani","html_url":"https://github.com/lgiordani","followers_url":"https://api.github.com/users/lgiordani/followers","following_url":"https://api.github.com/users/lgiordani/following{/other_user}","gists_url":"https://api.github.com/users/lgiordani/gists{/gist_id}","starred_url":"https://api.github.com/users/lgiordani/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lgiordani/subscriptions","organizations_url":"https://api.github.com/users/lgiordani/orgs","repos_url":"https://api.github.com/users/lgiordani/repos","events_url":"https://api.github.com/users/lgiordani/events{/privacy}","received_events_url":"https://api.github.com/users/lgiordani/received_events","type":"User","site_admin":false},"created_at":"2015-11-13T07:41:32Z","updated_at":"2015-11-13T07:41:32Z","body":"@allancarter I can't reproduce it. Are you using the last gitflow version? May you please run the following bash code and tell if and where it fails?\r\n\r\n``` sh\r\nmkdir test_empty_feature\r\ncd test_empty_feature\r\n\r\ngit init\r\ngit flow init -d\r\n\r\ntouch test.txt\r\ngit add test.txt\r\ngit ci -m \"Just a test\"\r\n\r\ngit flow feature start test1\r\n\r\ngit flow feature start test2\r\necho \"test1\" > test.txt\r\ngit add test.txt\r\ngit ci -m \"Test fixed\"\r\ngit flow feature finish\r\n\r\ngit flow feature finish test1\r\n\r\ngit br -avv\r\n```\r\n\r\nThat \"nothing to squash\" is not what I expected. May you perhaps better describe your setup with submodules?"}}