-
New Feature
-
Resolution: Unresolved
-
Trivial
-
None
-
windows
When using Merge Before Build, sometimes throws error:
git merge --ff df24f37fedf6048881cc0683a782c975b0bd8db7 # timeout=10
ERROR: Timeout after 10 minutes
> git config core.sparsecheckout # timeout=10
> git checkout -f df24f37fedf6048881cc0683a782c975b0bd8db7 # timeout=20
FATAL: Could not lock repository. Please try again
and next build in the same workspace is failed with error:
FATAL: Could not lock repository. Please try again
This happens because my repositore is very big. I want set a merge timeout or kill git process before next try.
Thanks
With respect to this issue from a bit of research I suppose the changes are to be made to `PreBuildMerge.java` and my question is would we set the timeout just before the merge happens so that the process does not give an error or do we want to check if the merge has failed due to timeout by storing it in the `BuildData` and killing the process so that a new merge is attempted with a changed timeout.