GIT Error: The following untracked working tree files would be overwritten by merge:

-
Recently I renamed following file names(changed only captal to simple) and added to branch(abc) and commited them.
I pushed the branch as well. 
app/SocialMedia/EmailShare.php --> app/SocialMedia/Emailshare.php
        app/SocialMedia/EmailShareFactory.php ---> app/SocialMedia/EmailshareFactory.php

After that I tried to checkout a different branch(beta). Accidently git throws following error.

$ git checkout beta
error: The following untracked working tree files would be overwritten by checkout:
        app/SocialMedia/EmailShare.php
        app/SocialMedia/EmailShareFactory.php
Please move or remove them before you can switch branches.
Aborting

But when applying git status command no files to commit

$ git status
On branch abc
nothing to commit, working directory clean

Finally I checkout master branch. It was succefull. I think, because those files are still not in the master branch.

After that I was able to checkout beta branch as well. Now that error happens again when I'm going to merge a branch to beta branch. Then I used gitlab to merge. It was successfull. Then I tried to pull beta branch in command line. It gives an error again.

==========================================================================================
Solution


1. Fetch all

git fetch --all

2. Reset to beta branch

git reset --hard origin/beta

Location: Colombo, Sri Lanka

Comments

Post a Comment

Popular posts from this blog

Laravel Sail on Windows issue - "cmdlet Invoke-WebRequest at command pipeline position 1"

-
Image
I tried to install a laravel example app using Laravel Sail. When I executed following command I got following error even I install Docker Desktop in Powershell cmdlet Invoke-WebRequest at command pipeline position 1  Supply values for the following parameters:  Uri:  Then I tried to find the issue in the laravel documentation. But it is not explained about this issue and recommended steps either. I have found following solution:   1) You need to enable WSL in docker desktop. 2) Install WSL on the computer using Windows terminal - https://apps.microsoft.com/detail/9n0dx20hk701?hl=en-US&gl=US Install WSL - https://learn.microsoft.com/en-us/windows/wsl/install 3) You may be able to open tabs in Terminal with installed linux distribution. Thank you
Read more

How to point Magento multi websites to domains

-
Image
Backend configurations Add secure and unsecure domain urls for websites Add default domain url default config Index.php changes You need edit index.php file as follows switch($_SERVER['HTTP_HOST']) {     case ' domain.co.uk ':     case 'www. domain.co.uk ':         $mageRunCode = 'base';         $mageRunType = 'website';     break;     case ' domain.eu ':     case 'www. domain.eu ':         $mageRunCode = 'euwebsite';         $mageRunType = 'website';     break; } Comment following lines if you have /* Run store or run website */ $mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store';   Point main domain by adding your hosting server dns in domain registrar ...
Read more