Smart Cherrys Thoughts AWS DevOps Engineer Course- Sai Charan Paloju Solution For Conflicts while Merging Same File In Github Repository Done From CLI

Solution For Conflicts while Merging Same File In Github Repository Done From CLI

Solution For Conflicts while Merging Same File In Github Repository Done From CLI post thumbnail image

Solution For Conflicts while Merging Same File In Github Repository Done From CLI- when two developers are working on same file which is there in a secondary branch, after completion of work, when the same file with different changes came from two different developers, conflict takes place while merging that file to the main branch. here is the solution for it.

 

Undo File Which Is In Working Stage

 

Undo File Which Is In Staged-CLI-GITHUB-Sai Charan Paloju- Smart Cherrys Thoughts- DevOps Engineer Course

Undo File Which Is In Commit

Tags: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,

Leave a Reply

Your email address will not be published. Required fields are marked *

Related Post

Software Developer work flow- Git- Github- CLI- Version control system- Stages- Creating New RespositorySoftware Developer work flow- Git- Github- CLI- Version control system- Stages- Creating New Respository

Software Developer work flow- Git- Github- CLI- Version control system- Stages- Creating New Respository-  Creating files with CLI and pushing it to Github and using AWS EC2 instance for Infrastructure.