Hi, It is very common that when we work in a software development team we encounter conflicts when we want to merge our current branch with the branch where everyone is merging. Let see an example of a git conflict; let suppose that we are 2 developers in the same project and each developer has … Continue reading Git rebase and resolve conflicts through the terminal