DevOps

Wednesday, 17 July 2019

When I try to run git pull origin master, I got the below error.

Git stash

[ec2-user@ip-ec2-instance]$ git pull origin master
From https://git-codecommit.eu-west-2.amazonaws.com/v1/repos/project-repo
 * branch            master     -> FETCH_HEAD
Updating 2ef21e9..5ddaa4e
error: Your local changes to the following files would be overwritten by merge:
        modules/cmx_developer/api_asg_config.tf
Please commit your changes or stash them before you merge.
Aborting

Useful link for Git :

https://git-scm.com/docs/git-stash