[esp-r] Re: commit fails

[Leen Peeters]

solved ;-)

Quoting Leen Peeters <Leen.Peeters at mech.kuleuven.be>:

> Dear all
> 
> I try to commit, getting the following message 'svn: Commit failed
> (details follow):
> svn: Aborting commit:
> '/home/lpeeters/Src/Leen_Peeters/src/esrubld/bcfunc.F' remains in
> conflict
> 
> 
> However in that particular file no '<<<<<' or '>>>>>' or 'mine' is to
> be
> found.
> 
> Any suggestions on how this could be solved?
> 
> 
> Leen 
> 
> Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
> 
> 
> _______________________________________________
> esp-r mailing list
> esp-r at lists.strath.ac.uk
> http://lists.strath.ac.uk/mailman/listinfo/esp-r
> 





Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm