Re: 3 way merge during git p4 rebase is attempting to reapply past commits

2013-05-08 Thread Christopher Yee Mon
git p4 rebase and git p4 submit don't work on a bare repo (at least it didn't for me) This is weird since there is a --bare option for git p4 clone, but then you can't do git p4 submit's on that bare repo back up to perforce? I got an error stating: git p4 rebase Performing incremental import

3 way merge during git p4 rebase is attempting to reapply past commits

2013-05-07 Thread Christopher Yee Mon
Hello, I have a setup where I have a remote non-bare repo cloned from a perforce workspace. It is used as a remote repo that people clone into their own user repos, make commits to, then push back into the remote repo. Then I periodically run the following commands in a script to push those

Re: 3 way merge during git p4 rebase is attempting to reapply past commits

2013-05-07 Thread Luke Diamand
On 08/05/13 00:12, Christopher Yee Mon wrote: Hello, I have a setup where I have a remote non-bare repo cloned from a perforce workspace. It is used as a remote repo that people clone into their own user repos, make commits to, then push back into the remote repo. Why is your p4 clone non-bare?