was geändert
Merge branch 'master' of github.com:mkernel/git-sandkasten
#1 comment Link @leksiss
New File in Branch Sascha
Anderuung fuer Kim
ich ändere mal was
Merge remote-tracking branch 'origin/BranchSascha'
änderung für Samuel
Änderung im Branch Sascha
Merge branch 'master' of github.com:mkernel/git-sandkasten

Conflicts:
	file3.txt
take it once again
Merge branch 'master' of https://github.com/mkernel/git-sandkasten
Merge remote-tracking branch 'origin/BranchSascha'
Merge branch 'master' of https://github.com/mkernel/git-sandkasten
Merge branch 'refs/heads/master' into Users
ein Bild für unsere tolle gruppe
Merge branch 'master' of github.com:mkernel/git-sandkasten
Konflikt gelöst in file4.txt
allo
allo