GIT + File update limit
Posted: Thu Mar 21, 2019 4:10 pm
We are using Flare 2018 R2 here in the UK, to assist in authoring a project based in the USA where GIT is used.
Of late we have been having 2 serious issues:
1) Conflicts, where say 3 out of 4 can be resolved by simply rejecting changes made in the UK. But the 4th stubbornly refuses to allow any action. The solution is usually to do a "git status", where the file in question will appear as needing updated - then adding that file with a git add command.
2) We cannot pin down a number, but the USA end today reported as follows: "So far I have this narrowed down to a number greater than 126 (which worked for me today) and less than 186 (which failed for me a few days back - only 53 files getting committed)."
Has anyone any suggestions as to possible causes?
Of late we have been having 2 serious issues:
1) Conflicts, where say 3 out of 4 can be resolved by simply rejecting changes made in the UK. But the 4th stubbornly refuses to allow any action. The solution is usually to do a "git status", where the file in question will appear as needing updated - then adding that file with a git add command.
2) We cannot pin down a number, but the USA end today reported as follows: "So far I have this narrowed down to a number greater than 126 (which worked for me today) and less than 186 (which failed for me a few days back - only 53 files getting committed)."
Has anyone any suggestions as to possible causes?