I did a presentation on git to my team . It covered following topics .
- An introduction to git.
- Git vs other scm systems.
- What is rebasing workflow ?
- Good practices in SCM.
- A list of most used and important commands in git.
View the presentation here : https://slides.com/salimmalik/deck-1
Sometimes when you rebase your branch with the master branch and after fixing a merge conflict you might encounter following issue
The loopy problem of git rebasing
$ git rebase –continue
Applying: loglevel equal to silent
No changes – did you forget to use ‘git add’?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
When you have resolved this problem, run “git rebase –continue”.
If you prefer to skip this patch, run “git rebase –skip” instead.
To check out the original branch and stop rebasing, run “git rebase –abort”.
But the problem you might having is that you have already added the file using git add <yourconfilctedfilename> And might have added several times but still Git telling you to add the file again ??
Sometimes you got to skip your problems , bro
I have encountered this issue couple of times and it turns out is a Git bug which was later fixed with Git 2.0.2 version. So anyway in this case rather than updating your git application , you can simply do the git rebase –skip and just skip the patch. It will not do any harm because the patch was empty anyway .