**
Today i did a couple of things
.
**I learned
- How to solve merge conflicts.
- Create pull requests
- Collaboration workflow that is cloning and forking
What I did
I created repos and practised on solving merge conflicts , create pull requesting and cloned my repo.
Challenges i faced.
When I was learning on how to solve merge conflicts , i happened to create a branch from the wrong place.
When i tried merging i received a display message saying " fast foward merge " which was unexpected as i wanted to see a conflict then solve that.
How i solved the challenge.
1.Checked out to the main branch.
2.Edited the file, tracked it and commited.
3.Created a new branch (feature-education) and edited the same file with a different input.
3.Tracked this and committed.
4.Checked out to main and merged using the command(git merge feature-education.
5.Received now the popup conflict in the said file.
6.Resolved the conflict by opening the txt file and editing its content and saved.
7.Tracked the file and commited with a descriptive message explaining what i did.
8.Checked out to main and pushed to the main branch.
Resources I used.
I forked and stared a public github repo from Bonaventure Ogeto and have been doing the daily assignments provided here.
Also used chatgpt.com for explanation on why i received the message " fast foward"
What's next.
Tomorrow I'll be learning on how to undo mistakes on Github.
Top comments (0)