I usually follow these steps when I have two similar but distinct codebases:
- Create a new repo.
- Export everything from the LIVE server into the repo. Commit.
- Export everything from the TEST server into the repo. Commit.
Commit from step (3) would have all the differences between LIVE and TEST. I assume the code on TEST is newer, so that should be a later commit, but it you want to, you can swap the export order.
Before making a commit (3) you might want to remove trivial differences such as whitespaces, etc. Also Gitlab has a compare mode for commits which automatically ignores whitespace differences.
- Log in to post comments
.png)
.png)