Smart Cherrys Thoughts

Technology Services Provider

AWS DevOps Engineer Course- Sai Charan Paloju

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

BySai Charan Paloju

Dec 9, 2022 #AmazonEC2Components, #AmazonEC2InstanceTypes, #AmazonElasticBlockStorage-EBS, #AmazonElasticFileSystem-EFS, #AmazonMachineImages(AMI), #AmazonS3WebHosting, #AmazonSimpleStorageService-S3, #ApplicationLoadBalancer, #AttachLoadBalancertoAutoScaling, #AutoScalingGroups, #AWS Command Line Interface, #AWS Curriculum, #AWS Database Management, #AWS High Availability, #AWS Monitoring, #AWS Networking, #AWS Server Management, #AWS Storage Management, #AWSAvailabilityZones, #AWSCLIConfigurations, #AWSCLIFeatures, #AWSCommandLineInterface, #AWSDatabaseManagement, #AWSHighAvailability, #AWSInternetGateway, #AWSManagementConsole, #AWSMonitoring, #AWSNetworking, #AWSRegions, #AWSServerManagement, #AWSStorageManagement, #Backups-SNAPSHOTS, #Cloud Concepts, #Cloud DevOps Engineer Course, #CloudConcepts, #CloudProviders-AWSvsAZUREvsGCP, #CloudwatchAlarms, #CloudwatchDashboards, #ConfigureAWSCLI, #ConfigureEmailForHighCPUUsage, #ConfiguringFirewallsForEFSAccess, #CreatePAASMySQLDatabase, #CreatingaCustomVPCUsingAWSCLI, #CreatingDownScalePolicy, #CreatingUpScalePolicy, #CustomAmazonMachineImages, #Database&Tables, #DatabaseConcepts, #DefinethebenefitsoftheAWScloudincluding, #DeployingWebApplicationsOnEC2Instance, #DesigningCustomVPC-ClientRequirement, #DesigningHighlyAvailableVPC, #DesktopsvsServers, #EBSADDITIONALVolume, #EBSROOTVolume, #EBSVolumeTypes, #EBSvsEFSvsS3, #EC2IPAddressTypesPublicvsPrivatevsElastic, #Elasticity, #FundamentsofCloudComputing, #HighAvailability, #IAASvsPAASvsSAAS-CloudOfferings, #IAMOverview, #IAMPolicies, #IAMUsers, #ImplementingApplicationLoadBalancer, #InfrastructureAsAService(IAAS), #InstallAWSCLIonCentOS, #IntroductiontoLoadBalancing, #IntroductiontoScalability, #LaunchConfigurations, #LogicalDataCenters, #Monitoring-Cloudwatch, #NetworkingBasics-Protocol-Port-Firewall, #Pay-as-yougopricing, #PlatformAsAService(PAAS), #ProvisionEFSFileSystem, #RelationalDatabaseService(RDS)-Features, #Reliability, #sai charan paloju, #Scalability, #Security, #SetupJavaWebApplication-PAASMySQL, #SharedFileAccessacrossMultipleInstances, #SharesFileAccessacrossMultipleAvailabilityZones, #SimpleNotificationService-SNS, #smart cherrys tech, #smart cherrys thoughts, #SoftwareAsAService(SAAS), #SSHSoftware's-GitBash&Putty&Terminal, #TakeEC2ActionUsing-CloudWatch, #TraditionalNetworkingComponents, #UnderstandingCLIReference, #UnderstandingDefaultVPC, #UnderstandingRequirementsFromClient, #VPCNACL's, #VPCPublicSubnets, #VPCRouteTables, #VPCSecurityGroups, #VPCSubnetting, #WalkthroughAWSFreeTierAccount, #WorkwithSSHKeyPairs

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

By Sai Charan Paloju

Trained AWS Certified Solutions Architect Associate Course SAA-C02/Content Writer/Creator, Masters Degree- Software Engineering, Bachelors Degree- Computer Science & Engineering, Youtuber- Host/Interviewer/Content Creator/Video Editor, Podcaster- Host/Interviewer/Content Creator/Editor, Technical Writer, Social Media Manager/Influencer Ex-Professional Cricketer mailme@smartcherrysthoughts.com https://smartcherrysthoughts.com/

Related Post

AWS DevOps Engineer Course- Sai Charan Paloju

Sonar Analysis In Jenkins- DevOps Tools-CI/CD(Continuous Integration & Continuous Deployment)-Automation

Dec 26, 2022 Sai Charan Paloju
AWS DevOps Engineer Course- Sai Charan Paloju

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

Dec 26, 2022 Sai Charan Paloju
AWS DevOps Engineer Course- Sai Charan Paloju

Jenkins Notify Job: Post Build Actions- Email Notification-CI/CD(Continuous Integration & Continuous Deployment)

Dec 25, 2022 Sai Charan Paloju
One thought on “Solution For Conflicts while Merging Same File In Github Repository Done From CLI”

Leave a Reply

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