How to Resolve Merge CONFLICT in Git

by Ramesh ReddyDevOps

Dear Readers, In this article,we will see How to Resolve Merge CONFLICT in Git. Implementation Steps Create a new file “ktexperts-1” and put some content. Add and commit the file “ktexperts-1”. Switch to branch “Ktexperts-New-Branch”. Create a new file with same name “ktexperts-1”. Add and commit… Read More

Branching and Merging in Git

by Ramesh ReddyDevOps

Dear Readers, In this article,we will see Branching and Merging in Git. Implementation Steps Create a new branch “ktexperts-New-Branch” from branch “master”. Verify files/commits in branch “ktexperts-New-Branch”. Make a new file in branch “master”. Adding file to Staging Area. Commit the file into Local Repository.… Read More