Horje
git CONFLICT (modify/delete) Code Example
git CONFLICT (modify/delete) 
If you want to keep the file

$ git checkout <filename>
$ git add <filename>
$ git commit

If you want to discard the file

$ git rm <filename>
$ git commit
git CONFLICT (modify/delete) 
$ git checkout <filename>
$ git add <filename>
$ git commit
Source: stackoverflow.com



Shell

Related
open rdp port windows 10 using command line Code Example open rdp port windows 10 using command line Code Example
sudo !! alias Code Example sudo !! alias Code Example
git move change from master to new branch Code Example git move change from master to new branch Code Example
Files by size Code Example Files by size Code Example
unix timestamp bash Code Example unix timestamp bash Code Example

Type:
 Code Example
Category:
 Coding
Sub Category:
 Code Example
Uploaded by:
 Admin
Views:
 11



 

Horje