How to sync a clone of this repo after changing the name and adding more code.

nickjj / docker-rails-example

A production ready example Rails app that's using Docker and Docker Compose.

MIT License

941 stars 185 forks source link

How to sync a clone of this repo after changing the name and adding more code. #39

Closed yorsant closed 2 years ago

yorsant commented 2 years ago

I have tried to add this repo as an upstream to my clone of it and merge the main branch, but after changing the name for the project and adding some code it's becoming hard to solve all the conflicts there. Has anyone lived this pain? Is there any way to make this possible without having too many conflicts? Is there any other way to keep in sync?

Thanks.