{"thread":{"id":"27286","subject":"git-p4: keeping p4 and git in sync?","startedAt":"2011-05-06T21:39:27Z","lastAt":"2011-05-06T21:39:27Z","messageCount":1,"participants":["Luke Diamand"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"167288","messageId":"4DC46A8F.2080809@diamand.org","threadId":"27286","inReplyTo":null,"subject":"git-p4: keeping p4 and git in sync?","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2011-05-06T21:39:27Z","receivedAt":"2011-05-06T21:39:27Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"\nI've been using git-p4 to keep a git branch more-or-less tracking a \nperforce repository.\n\nThat works well with one person, but with more people it gets harder.\n\nI'd like to get to the point where the two branches are kept in sync \npretty much automatically, continually (modulo merge conflicts where the \nsame lines are touched in git and p4 simultaneously). Right now I'm \nusing \"git-p4 rebase\" manually.\n\nI'm just wondering if anyone else has done this, and what \nexperiences/techniques/problems they have?\n\nThanks\nLuke\n"}]}