Answer the question
In order to leave comments, you need to log in
How to deal with multiple remotes?
There is a product - CRM. First, I clone it to my development machine. As a result, there is a set of sources and an initialized repository with a long history, a bunch of release branches and more.
It is planned to develop in a new branch, but we need the ability to update the branches of the original product so that when a new version is released, we can merge it into our dev branch. How to set up such an environment?
Answer the question
In order to leave comments, you need to log in
If I understand correctly, then yes.
// получаем последние изменения
git checkout master
git pull origin master
// вливаем их к себе
git checkout feature
git merge --no-ff master
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question