Day 25 DevOps Log: Resolving Git Merge Conflicts and Setting AWS CloudWatch Alarms
A developer documenting a 100-day DevOps and cloud learning journey reached Day 25, tackling two hands-on tasks from the KodeKloud Engineer platform. The Git task involved merging a feature branch into master, covering fast-forward versus three-way merges, the use of the --no-ff flag to preserve branch history, and manually resolving conflicts by editing files and staging them with git add. A key takeaway was that Git stops on conflicts not due to failure, but because it requires a human decision, and that git merge --abort offers a safe rollback at any point. The AWS task involved launching an EC2 instance and configuring a CloudWatch alarm to monitor CPU utilization using aws cloudwatch put-metric-alarm. The alarm was set to trigger only after CPU usage exceeded 70% across two consecutive five-minute evaluation periods, totaling ten minutes, to avoid false positives from brief spikes.
This is an AI-generated summary. ShortSingh links to the original source for the complete article.

Discussion (0)
Log in to join the discussion and vote.
Log in