Konflikt?
New File in Branch Sascha
ich ändere mal was
Merge remote-tracking branch 'origin/BranchSascha'
Änderung im Branch Sascha
Merge remote-tracking branch 'origin/BranchSascha'
Merge branch 'master' of https://github.com/mkernel/git-sandkasten
Merge branch 'refs/heads/master' into Users
Kims Branch ist neu
ein Bild für unsere tolle gruppe
Merge branch 'master' of github.com:mkernel/git-sandkasten
Konflikt gelöst in file4.txt
Merge branch 'master' into newBranch