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

Smart Cherrys Thoughts
Average rating:  
 0 reviews
Tags: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,

Leave a Reply

Your email address will not be published.

Related Post

Jenkins Job-Distributed Build-CI/CD(Continuous Integration & Continuous Deployment)-AutomationJenkins Job-Distributed Build-CI/CD(Continuous Integration & Continuous Deployment)-Automation

Jenkins Job-Distributed Build-CI/CD(Continuous Integration & Continuous Deployment)-Automation- The Project or Job that is created in Jenkins, if we want to run that project or job in another server(node), we need