(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won’t be any conflicts now)
Reference:
[git] Merge with branch
Merge master into the development first so that if there are any conflicts, I can resolve in the development branch itself and my master remains clean.
(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won’t be any conflicts now)
Reference:
(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won’t be any conflicts now)
Reference:
0 意見:
張貼留言