What is a conflict in git
How to understand conflicts
$ git config --global alias.graph "log --all --graph --decorate --oneline"
How to minimize conflicts
$ git config --global merge.conflictstyle diff3
[merge] conflictstyle = diff3 tool = meld [mergetool] keepBackup = false [mergetool.meld] useAutoMerge = true
Our general strategies
$ git merge -s recursive -Xours somebranch $ git merge -s recursive -Xtheirs somebranch
Conflict resolution on the web
How to abort a conflicting merge
What is git rebase
git rebasediffers from a
git merge: https://coderefinery.github.io/git-branch-design/01-rebase/
Research Software Hour intro tune can be found at: https://soundcloud.com/w-m-vanvliet/research-software-hour-intro-tune
Nice that you are back! My question is: Does this git graph command work always? Or does it need special packages on the host cluster, please?
Rebase means just to attach a branch somewhere else to the head, please? Or at least at another position of the main (?) branch, please?
Does it have to be always main or could it be also another branch?
branch. More than anything I learned about it by playing with it some.
git rebase somebranchmeans move commits from my current branch which are not on