NCBD-166 flatten repo #51
Conversation
| url = https://github.com/PolymathNetwork/polkascan-pre-explorer-gui.git | ||
| [submodule "polkascan-explorer-gui"] | ||
| path = pm-explorer-gui/explorer-gui | ||
| url = https://github.com/polkascan/polkascan-explorer-gui.git |
There was a problem hiding this comment.
I have removed the submodules and copied the folders directly on the project. However, we need to have polkascan-explorer-gui as a submodule, and that is fine.
| @@ -2,6 +2,7 @@ version: '3' | |||
|
|
|||
| services: | |||
| explorer-api: | |||
| build: pm-explorer-api/. | |||
There was a problem hiding this comment.
I had to rename the project from explorer-api to pm-explorer-api because github was previously confused when we removed the submodule and kept the folder name.
same applies to explorer-gui and harvester submodules
|
@Tamir-Polymath how we are going to take upstream changes if we want to in this flat repo structure? Or the idea is to manually take the changes from the upstream and make it work with it ? |
Since I joined the company, we have submitted 10s of PRs to adjust the repo, each PR takes 4-8 hours of work and waiting for approvals in process. However, we pulled from upstream once or twice. So its a trade off, Instead of wasting alot of time to keep them separate, its easier to manually copy the new files from upstream. |
|
Hmm.. then what do you prefer to have merged these changes now and then work for the 3.0 upgrade or work on the upgrade before and then go with this flat branch model? I prefer the latter to make it less error-prone. |
No description provided.