git p4 submit failing

I tried running git p4 submit on a repo that I've been running as an interim bridge between git and perforce. Multiple people are using the repo as a remote and its being periodically submitted back to perforce. It's been working mostly fine. Then one day out of the blue I get this error. I can no

Re: git p4 submit failing

ible bug. Any assistance would be appreciated. On Sat, Apr 13, 2013 at 5:09 PM, Christopher Yee Mon wrote: > Yes this is the case. > > Many of the files have crlf endings. > > core.autocrlf was recently set to input. I can't remember the timeline > exactly though, but in addit

Re: git p4 submit failing

fig > setting "apply.ignorewhitespace"; not sure if that would allow > the apply step to apply an lf-ending patch to the crlf-ending p4 > workspace. > > -- Pete > >> Hello Simon, >> >> I have CCed you to alert you to the possible bug. Any

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

nd that did NOT solve the problem. http://stackoverflow.com/questions/16106900/git-p4-rebase-attempts-to-reapply-past-commits I'm not sure what could possibly be causing this or how to fix it. Does anyone have any ideas? Thanks Christopher Yee Mon -- To unsubscribe from this list: se

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

7;t trust to leave the operation scheduled, because some problem like this might crop up again. On Wed, May 8, 2013 at 1:35 AM, Luke Diamand wrote: > On 08/05/13 00:12, Christopher Yee Mon wrote: >> >> Hello, >> >> I have a setup where I have a remote non-bare repo clon