Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Me and my team want to start work on a website based on an open-source framework. For this I want to get the latest source code and start with this as our baseline.
My question is, how should we approach update scenarios, meaning how should I merge changes from the project’s repository into mine? My only idea would be to create patches and apply them locally, should this be enough?
Thank you
Can’t see a problem here. You could just setup to use 2 repositories – one is your local repository and one is remote project’s repository. For pushing you use only your local repository. Whenever there are changes in the projects repository, you update from it (giving you for example 2 branches – with your current changes and with remote repository changes), merge and push to your local.
Using patches is also an idea, though it would give you 2 branches anyway and less flexibility.