we have 2 main branches on our project. first 1 stable(the current successful build) , second unstable(experimentation). branched out unstable , started working on functionality. need latest update stable.
i know if git rebase origin/stable viable option latest changes stable.
git fetch git merge way achieve this. on different branch on own can git pull , git merge. make branch cleanly able merge stable 1 (after fix conflicts).
to git checkout stable git merge unstable , when happy git push origin stable.
if rebase can cool things merge code stable point in time before changed things , single commits added @ time. handy remote working (with no access main repo) when wish code in patch clean. in case think fetch , merge in branch want. can merge stable when happy.
Comments
Post a Comment