learning git rebase conflict resolution
Learning Git