Adding master
Adding new
Deleting master text
Merge branch 'new'
Deleting new text
Added 2 on master to simulate rebase
Added 4 on master to simulate rebase
Added 1 on B1 to simulate rebase
Added 3 on B1 to simulate rebase
overlapping changes in 1.txt to simulate stash conflict
overlapping changes in 1.txt to simulate stash conflict
overlapping changes in 1.txt to simulate stash conflict
overlapping changes in 1.txt to simulate stash conflict
Overlapping changes in 1.txt - Also noted that conflict markers get committed as well if we add the file in conflicted state, hence its the onus of the user to resolve the conflict and remove the markers manually before adding.
Unclean commit
Clean commit
Clean commit on teststash branch
Clean commit#2 on teststash branch
Merged teststash back to master after clean commit