Hello all, I have recently joined a team there seems to be a couple of issue with the git repositories:
1- A branch created from development cannot be merged into the production branch. (production) git merge development_feature_branch fatal: refusing to merge unrelated histories 2- If there is a file that only has a 1 line difference in production, a git diff will return that the whole file is different: git diff production:folder development:folder “ diff --git a/folder/file.py b/folder/file.py index 9bfd6612..20cce520 100644 --- a/folder/file py +++ b/folder/file.py @@ -1,245 +1,245 @@ “ I’m not 100% sure what happened here. But it seems that changes and added files are copied and pasted into the production branch and uploaded indepenedently as separate files, contributing to a huge difference between branches. How can I confirm this hypothesis, and what steps can I take to solve it? Thank you.
