[ git ] error: addinfo_cache failed for path

Problem

error: addinfo_cache failed for path

Solution

#################### Reset header on both side & commit
git reset -- assets/loc-lang-constants.json
git add assets/loc-lang-constants.json
git commit -m "Resolve loc-lang-constants.json 1"
git push
#################### Copy the real file and replace it after pulling in assets/loc-lang-constants.json
git pull -X theirs
git add assets/loc-lang-constants.json
git commit -m "Resolve loc-lang-constants.json 2"
git push
#################### But there're some conflicts cannot be resolved. So we commit it again with conflicts.
git pull -X theirs
git add assets/loc-lang-constants.json
git commit -m "Resolve loc-lang-constants.json 3"
git push
#################### Copy the real file and replace it. There're some modification must be committed. So we commit it again.
git pull -X theirs
git add assets/loc-lang-constants.json
git commit -m "Resolve loc-lang-constants.json 4"
git push
#################### Finally done
git pull -X theirs
Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s