Git issue
- From
- Halde, Faiz <fhalde@paypal.com>
- Date
- Nov 1, 2016, 10:28 UTC
- Message-ID
- <BY2PR0601MB16400EAC3E9683841907F4B2A2A10@BY2PR0601MB1640.namprd06.prod.outlook.com>
Hello Git
Not sure if this is a feature or a bug, but here it is.
I frequently use the following command to ignore changes done in a file
git update-index --assume-unchanged somefile
Now when I do a pull from my remote branch and say the file 'somefile' was changed locally and in remote, git will abort the merge saying I need to commit my changes of 'somefile'.
But isn't the whole point of the above command to ignore the changes within the file?
Thanks Faiz Halde