{"action":"created","issue":{"url":"https://api.github.com/repos/scribusproject/scribus/issues/13","labels_url":"https://api.github.com/repos/scribusproject/scribus/issues/13/labels{/name}","comments_url":"https://api.github.com/repos/scribusproject/scribus/issues/13/comments","events_url":"https://api.github.com/repos/scribusproject/scribus/issues/13/events","html_url":"https://github.com/scribusproject/scribus/issues/13","id":42531136,"number":13,"title":"Define a syncronization workflow","user":{"login":"aoloe","id":1857016,"avatar_url":"https://avatars.githubusercontent.com/u/1857016?v=3","gravatar_id":"","url":"https://api.github.com/users/aoloe","html_url":"https://github.com/aoloe","followers_url":"https://api.github.com/users/aoloe/followers","following_url":"https://api.github.com/users/aoloe/following{/other_user}","gists_url":"https://api.github.com/users/aoloe/gists{/gist_id}","starred_url":"https://api.github.com/users/aoloe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aoloe/subscriptions","organizations_url":"https://api.github.com/users/aoloe/orgs","repos_url":"https://api.github.com/users/aoloe/repos","events_url":"https://api.github.com/users/aoloe/events{/privacy}","received_events_url":"https://api.github.com/users/aoloe/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":{"login":"aoloe","id":1857016,"avatar_url":"https://avatars.githubusercontent.com/u/1857016?v=3","gravatar_id":"","url":"https://api.github.com/users/aoloe","html_url":"https://github.com/aoloe","followers_url":"https://api.github.com/users/aoloe/followers","following_url":"https://api.github.com/users/aoloe/following{/other_user}","gists_url":"https://api.github.com/users/aoloe/gists{/gist_id}","starred_url":"https://api.github.com/users/aoloe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aoloe/subscriptions","organizations_url":"https://api.github.com/users/aoloe/orgs","repos_url":"https://api.github.com/users/aoloe/repos","events_url":"https://api.github.com/users/aoloe/events{/privacy}","received_events_url":"https://api.github.com/users/aoloe/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/scribusproject/scribus/milestones/1","html_url":"https://github.com/scribusproject/scribus/milestones/Scribus%20on%20GitHub","labels_url":"https://api.github.com/repos/scribusproject/scribus/milestones/1/labels","id":787623,"number":1,"title":"Scribus on GitHub","description":"Issues related to getting ScribusProject up and running on GitHub. Mostly infrastucture issues","creator":{"login":"luzpaz","id":4140247,"avatar_url":"https://avatars.githubusercontent.com/u/4140247?v=3","gravatar_id":"","url":"https://api.github.com/users/luzpaz","html_url":"https://github.com/luzpaz","followers_url":"https://api.github.com/users/luzpaz/followers","following_url":"https://api.github.com/users/luzpaz/following{/other_user}","gists_url":"https://api.github.com/users/luzpaz/gists{/gist_id}","starred_url":"https://api.github.com/users/luzpaz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/luzpaz/subscriptions","organizations_url":"https://api.github.com/users/luzpaz/orgs","repos_url":"https://api.github.com/users/luzpaz/repos","events_url":"https://api.github.com/users/luzpaz/events{/privacy}","received_events_url":"https://api.github.com/users/luzpaz/received_events","type":"User","site_admin":false},"open_issues":3,"closed_issues":4,"state":"open","created_at":"2014-09-12T13:57:45Z","updated_at":"2014-09-12T23:15:49Z","due_on":"2014-09-30T07:00:00Z","closed_at":null},"comments":12,"created_at":"2014-09-11T14:38:41Z","updated_at":"2015-04-15T02:25:21Z","closed_at":null,"body":"Currently, we have:\r\n\r\n- The \"svn\" branch that get's automtically updated from the scribus' svn server.\r\n- The \"master\" branch that is manually kept in sync with the \"svn\" branch. This branch is where pull requests from the forks will be committed to 'master' after review.\r\n\r\nWe need to find a good workflow that allows us to keep the \"master\" in sync with the commits with the team.\r\n\r\nThe issues that should be considered:\r\n- conflicts that happen when a patch from \"master\" is also applied -- with small changes -- into the svn \"trunk\".\r\n- each patch that gets into \"master\" (on github) will have also to be manually uploaded to the bug tracker and we will have to wait (potentially for a long time) before they are applied \"upstream\".\r\n\r\nAs long as we have not pulled anything into master yet, we can use the simple workflow described by sarath:\r\n\r\nUntil we have a good workflow we can follow a simpler one (made possible by the fact that \"master\" has no changes yet):\r\n- https://github.com/sarathms/scribus/wiki/git-developer-workflow describes how anybody can make a pull request for the update.\r\n- here is the workflow for somebody having push rights on the scribusproject repository:\r\n\r\n  ```\r\n  $ git clone git@github.com:scribusproject/scribus.git scribus-github\r\n  $ git checkout svn\r\n  $ git pull\r\n  $ git checkout master\r\n  $ git pull\r\n  $ git merge svn -X theirs\r\n  $ git push origin master\r\n```"},"comment":{"url":"https://api.github.com/repos/scribusproject/scribus/issues/comments/93156163","html_url":"https://github.com/scribusproject/scribus/issues/13#issuecomment-93156163","issue_url":"https://api.github.com/repos/scribusproject/scribus/issues/13","id":93156163,"user":{"login":"luzpaz","id":4140247,"avatar_url":"https://avatars.githubusercontent.com/u/4140247?v=3","gravatar_id":"","url":"https://api.github.com/users/luzpaz","html_url":"https://github.com/luzpaz","followers_url":"https://api.github.com/users/luzpaz/followers","following_url":"https://api.github.com/users/luzpaz/following{/other_user}","gists_url":"https://api.github.com/users/luzpaz/gists{/gist_id}","starred_url":"https://api.github.com/users/luzpaz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/luzpaz/subscriptions","organizations_url":"https://api.github.com/users/luzpaz/orgs","repos_url":"https://api.github.com/users/luzpaz/repos","events_url":"https://api.github.com/users/luzpaz/events{/privacy}","received_events_url":"https://api.github.com/users/luzpaz/received_events","type":"User","site_admin":false},"created_at":"2015-04-15T02:25:21Z","updated_at":"2015-04-15T02:25:21Z","body":"Because we haven't heard from @moskalenko I've for the time being disassociated @mrscribe from the project and @aoloe I anticipate will be working on implementing @chhitz's great work at https://github.com/scribusproject/scribus_svn_git"}}