Horje
git find merge conflicts Code Example
git find merge conflicts 
git diff --name-only --diff-filter=U
Source: stackoverflow.com
how to handle merge conflicts 
git stash        -- > take my project to temp memory
git pull         -- > pull the project from GitHub to working directory
						(my computer)
git stash pop    -- > take my project to my working directory,     
					fix the conflict and merge the project.
git add .
git commit –m “comment”
git push



Shell

Related
uncommit last commit in local Code Example uncommit last commit in local Code Example
git reset last commit keep changes Code Example git reset last commit keep changes Code Example
git revert commit but keep changes Code Example git revert commit but keep changes Code Example
install seaborn Code Example install seaborn Code Example
pause powershell script until keypress Code Example pause powershell script until keypress Code Example

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



 

Horje