{"action":"opened","issue":{"url":"https://api.github.com/repos/mezis/git-whistles/issues/42","labels_url":"https://api.github.com/repos/mezis/git-whistles/issues/42/labels{/name}","comments_url":"https://api.github.com/repos/mezis/git-whistles/issues/42/comments","events_url":"https://api.github.com/repos/mezis/git-whistles/issues/42/events","html_url":"https://github.com/mezis/git-whistles/issues/42","id":68598458,"number":42,"title":"git-merge-po hard to understand","user":{"login":"rmoehn","id":311879,"avatar_url":"https://avatars.githubusercontent.com/u/311879?v=3","gravatar_id":"","url":"https://api.github.com/users/rmoehn","html_url":"https://github.com/rmoehn","followers_url":"https://api.github.com/users/rmoehn/followers","following_url":"https://api.github.com/users/rmoehn/following{/other_user}","gists_url":"https://api.github.com/users/rmoehn/gists{/gist_id}","starred_url":"https://api.github.com/users/rmoehn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rmoehn/subscriptions","organizations_url":"https://api.github.com/users/rmoehn/orgs","repos_url":"https://api.github.com/users/rmoehn/repos","events_url":"https://api.github.com/users/rmoehn/events{/privacy}","received_events_url":"https://api.github.com/users/rmoehn/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":0,"created_at":"2015-04-15T07:18:39Z","updated_at":"2015-04-15T07:18:39Z","closed_at":null,"body":"I'm trying to modify git-merge-po so that it accepts an option like -Xours. However, I have a hard time understanding how it works, not least because the documentation of the gettext tools is rather thin and I don't know what really happens when I run a command. So it would be very nice if you could clarify a bit how and why git-merge-po works.\r\n\r\nIn particular, I encountered one problem: according to the comment, `${TEMP}.local-only` should only contain messages that were changed only on local. However, look at the last message:\r\n\r\n```\r\n#, fuzzy\r\nmsgid \"\"\r\nmsgstr \"\"\r\n\"#-#-#-#-#  temp.local-changes (Local header)  #-#-#-#-#\\n\"\r\n\"Project-Id-Version: Local header\\n\"\r\n\"Content-Type: text/plain; charset=UTF-8\\n\"\r\n\"#-#-#-#-#  temp.conflicts (Remote header)  #-#-#-#-#\\n\"\r\n\"#-#-#-#-#  temp.remote-changes (Remote header)  #-#-#-#-#\\n\"\r\n\"Project-Id-Version: Remote header\\n\"\r\n\"Content-Type: text/plain; charset=UTF-8\\n\"\r\n\"#-#-#-#-#  temp.local-changes (Local header)  #-#-#-#-#\\n\"\r\n\"Project-Id-Version: Local header\\n\"\r\n\"Content-Type: text/plain; charset=UTF-8\\n\"\r\n\r\nmsgid \"This little piggie is removed from remote, changed on local\"\r\nmsgstr \"3.local\"\r\n\r\n# msgid \"This little piggie is removed from local, unchanged on remote\"\r\n# msgstr \"4\"\r\n# msgid \"This little piggie is removed from local, changed on remote\"\r\n# msgstr \"5\"\r\nmsgid \"This little piggie is changed on local, unchanged on remote\"\r\nmsgstr \"6.local\"\r\n\r\nmsgid \"This little piggie is changed on remote and local\"\r\nmsgstr \"8.local\"\r\n```"}}