I want to cover git checkout/checkin from local branch to remote branch.
Say I have few added files and want to checkin those changes to local branch and then merge them and push them to remote branch. And also want to be upto date with remote branch.
Local branch: develop
Remote branch: master
The below are the steps.
Step1: git status
Step2: git add */ git add
Step3: git commit -m "comment"
Step4: git checkout master
Step5: git pull
Step6: git merge develop
Step7: git push origin master
Step8: git branch
Step9: git checkout develop
This flow is what works for me. Hope this info helps some one.
Say I have few added files and want to checkin those changes to local branch and then merge them and push them to remote branch. And also want to be upto date with remote branch.
Local branch: develop
Remote branch: master
The below are the steps.
Step1: git status
Step2: git add */ git add
Step3: git commit -m "comment"
Step4: git checkout master
Step5: git pull
Step6: git merge develop
Step7: git push origin master
Step8: git branch
Step9: git checkout develop
This flow is what works for me. Hope this info helps some one.