GIT: conflict resolve on pull or merge
Theirs on top git pull -s recursive -X theirs <remote> <branch> git merge -s recursive -X theirs <branch> My on top git pull -s recursive -X ours <remote> <branch> git merge -s recursive -X ours <branch>
Category: git
git: file history with diff
Show diff ONLY for src/main/resources/file.xml git log -p src/main/resources/file.xml Show diff for ALL FILES that touches src/main/resources/file.xml git log -p –full-diff src/main/resources/file.xml
Git tags
Tags git tag -a v1.0 -m ‘version 1.0’ # add tag git tag -d v1.0 # remove tag git push origin :refs/tags/v1.0 # remove remote tag
git (github) repository as npm dependency
{ "name": "node-sample-app", "version": "0.0.1", "private": true, "scripts": { "start": "node app.js" }, "dependencies": { "private-module1": "git+https://github.com/marioosh-net/private-module1", "private-module2": "git+ssh://github.com/marioosh-net/private-module2#master" } }{ "name": "node-sample-app", "version": "0.0.1", "private": true, "scripts": { "start": "node app.js" }, "dependencies": { "private-module1": "git+https://github.com/marioosh-net/private-module1", "private-module2": "git+ssh://github.com/marioosh-net/private-module2#master" } } more info here
Git usable commands
Delete remote and local branch git push origin :branch-to-delete git branch -d branch-to-delete Rename local branch git branch -m old-branch new-branch Join/merge last X (in example below 3) commits into one git rebase -i HEAD~3 In editor (pick last, squash 2 earlier commits): pick 7e168d2 commit message 3 s b3bd215 commit message 2 s 436052d Read more about Git usable commands[…]