{"action":"created","issue":{"url":"https://api.github.com/repos/Beep6581/RawTherapee/issues/3057","labels_url":"https://api.github.com/repos/Beep6581/RawTherapee/issues/3057/labels{/name}","comments_url":"https://api.github.com/repos/Beep6581/RawTherapee/issues/3057/comments","events_url":"https://api.github.com/repos/Beep6581/RawTherapee/issues/3057/events","html_url":"https://github.com/Beep6581/RawTherapee/issues/3057","id":124636089,"number":3057,"title":"How to commit and merge branch retinexadd","user":{"login":"Desmis","id":13764697,"avatar_url":"https://avatars.githubusercontent.com/u/13764697?v=3","gravatar_id":"","url":"https://api.github.com/users/Desmis","html_url":"https://github.com/Desmis","followers_url":"https://api.github.com/users/Desmis/followers","following_url":"https://api.github.com/users/Desmis/following{/other_user}","gists_url":"https://api.github.com/users/Desmis/gists{/gist_id}","starred_url":"https://api.github.com/users/Desmis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Desmis/subscriptions","organizations_url":"https://api.github.com/users/Desmis/orgs","repos_url":"https://api.github.com/users/Desmis/repos","events_url":"https://api.github.com/users/Desmis/events{/privacy}","received_events_url":"https://api.github.com/users/Desmis/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2016-01-03T08:05:55Z","updated_at":"2016-01-03T08:49:34Z","closed_at":null,"body":"Hello\r\nI'll try to speak in english...I hope no misunderstandings.\r\n\r\n1) after Hombre and Sguilder help me to rebuild new environnement with MSYS2, I try to update \"reinexadd\"\r\n\r\n2) in the same time Hombre push a big change, (that works nice !!), and now there are big conflicts\r\n\r\n3) as I don't know how to with git...(Git book don't realy help me...the key is hidden in the detail), I made this fusion entirely manually from files that appear in the commit  (with the + and - head lines)...big work!\r\n\r\n4) I compile and to my surprise ... no errors\r\n\r\n5) now I have (on my computer) the code that makes the sum of Retinex (add) and soft proofing\r\n\r\n6) I add the new files : git add rtdata\\.....png  and git add tools\\...\r\n\r\n7) and after I want to commit and write : \r\n git commit -m \"update retinexadd with master 4d6833c\" -a\r\n\r\nAnd the system says : \r\nPlease tell me who you are\r\n* to set your account's default identity\r\n\r\nOn \"Msys64\" it appears ==> jacques@pc-bureau\r\n\r\nI run :\r\n* git config --global user.name \"Desmis\"\r\n* git config --global user.mail jdesmis@gmail.com\r\nThese 2 config was those I used previously \r\n\r\nBut after that...always the same message : \r\n*Please tell me who you are\r\n*run => git config --global user.name  and git config --global user.mail\r\n\r\nand always I have the same message : \r\nfatal : unable to auto-detect email adress (got 'jacques@pc-bureau.(none))\r\n\r\n8) If this point is solved, how to merge ?\r\nThank you :)\r\n"},"comment":{"url":"https://api.github.com/repos/Beep6581/RawTherapee/issues/comments/168479130","html_url":"https://github.com/Beep6581/RawTherapee/issues/3057#issuecomment-168479130","issue_url":"https://api.github.com/repos/Beep6581/RawTherapee/issues/3057","id":168479130,"user":{"login":"Desmis","id":13764697,"avatar_url":"https://avatars.githubusercontent.com/u/13764697?v=3","gravatar_id":"","url":"https://api.github.com/users/Desmis","html_url":"https://github.com/Desmis","followers_url":"https://api.github.com/users/Desmis/followers","following_url":"https://api.github.com/users/Desmis/following{/other_user}","gists_url":"https://api.github.com/users/Desmis/gists{/gist_id}","starred_url":"https://api.github.com/users/Desmis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Desmis/subscriptions","organizations_url":"https://api.github.com/users/Desmis/orgs","repos_url":"https://api.github.com/users/Desmis/repos","events_url":"https://api.github.com/users/Desmis/events{/privacy}","received_events_url":"https://api.github.com/users/Desmis/received_events","type":"User","site_admin":false},"created_at":"2016-01-03T08:49:34Z","updated_at":"2016-01-03T08:49:34Z","body":"I verify on GitHub and:\r\nMy name = Desmis\r\nPublic email = jdesmis@gmail.com\r\n\r\nWhen I open Msys64, with Mingw64_shell, it appears \r\njacques@pc-bureau MINGW64\r\nWhat is wrong ?\r\n"}}