100-Days-Of-DevOps-Challenge-KodeKloud

Git Merge Conflict Resolve

Sarah and Max were working on writting some stories which they have pushed to the repository. Max has recently added some new changes and is trying to push them to the repository but he is facing some issues. Below you can find more details:

• SSH into storage server using user max and password Max_pass123. Under /home/max you will find the story-blog repository. Try to push the changes to the origin repo and fix the issues. The story-index.txt must have titles for all 4 stories. Additionally, there is a typo in The Lion and the Mooose line where Mooose should be Mouse.

• Click on the Gitea UI button on the top bar. You should be able to access the Gitea page. You can login to Gitea server from UI using username sarah and password Sarah_pass123 or username max and password Max_pass123.

Note: For these kind of scenarios requiring changes to be done in a web UI, please take screenshots so that you can share it with us for review in case your task is marked incomplete. You may also consider using a screen recording software such as loom.com to record and share your work.

Steps

1. Login into storage server

2. Update the remote changes

    git fetch origin
   

3. Rebase

    git rebase origin/main
   
    git add .
   
    git rebase --continue
   

4. Push

    git push
   

Good to Know?

Merge Conflicts

• Cause: Same lines modified in different branches
• Detection: Git cannot automatically resolve differences
• Manual Resolution: Developer must choose which changes to keep
• Common Scenarios: Concurrent edits, file renames, deletions

Conflict Markers

• HEAD Section: <<<<<<< HEAD - Current branch changes
• Separator: ======= - Divides conflicting sections
• Incoming: >>>>>>> branch-name - Changes from other branch
• Resolution: Remove markers and choose desired content

Resolution Process

1. Identify Conflicts: Git marks conflicted files
2. Edit Files: Manually resolve conflicts
3. Stage Changes: git add resolved files
4. Continue: git rebase --continue or commit merge
5. Test: Verify resolution works correctly

Prevention Strategies

• Frequent Pulls: Stay updated with remote changes
• Small Commits: Reduce conflict probability
• Communication: Coordinate with team on file changes
• Feature Branches: Isolate work to minimize conflicts

This site is open source. Improve this page.