What I did Today
Earlier before i started week-two I was to merge my week-one progress to main.
So I had missed this part and that's what I did today.
Step by step Procedure
How do you merge a certain branch to main considering you are working on another branch and you have to keep everything upto date locally?
1.1st you have to make sure you have tracked,commited and pushed everything to Github.
2.Go to Github and open a pull request from the branch you want to merge to main. Example: To merge week-one to main you have to open a PR from week-one branch
3.Merge that branch to main.
4.Locally:
git checkout main (makes sure ur on main branch)
git pull origin main
( makes sure ur computer is upto date with updates you made on github)
The commands update the local main.
5.Locally:
git checkout week-three(moves to week-three branch)
git merge main
If you are working now on week-three branch you checout to that branch and bring the current branch upto date.
6.Locally:
- git push origin week-three
Push merged updates to github.
7.Continue normally with your daily commits.
Resources I used
Referred to the public repo I had read about introduction to git and GitHub by Bonaventure Ogeto.
What's next
I'll be continuing with the python refresher series on Youtube
Top comments (0)