DevOps Practical Exam

This repository demonstrates basic Git operations including:

• Repository initialization
• Branch creation
• Merge conflicts
• Conflict resolution

Updates

• This line is added in main branch.
• This line is added in feature branch.

Merge Conflict Resolution

A merge conflict was created when the same section of README.md was modified in:

• main branch
• feature-branch

Main Branch Update

This line is added in main branch.

Feature Branch Update

This line is added in feature branch.

Steps to Resolve

1. Opened the conflicted file in VS Code
2. Reviewed both changes
3. Combined both updates logically
4. Removed conflict markers
5. Staged the resolved file using git add
6. Completed the merge using git commit

Conclusion

The conflict was successfully resolved by merging changes from both branches.