mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

allow autostashing changes when checking out a branch

Browse source
This commit is contained in:
Jesse Duffield 2019-03-16 12:45:38 +11:00
parent 0d208b7957
commit e583cc2519
5 changed files with 84 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/repos/merge_conflict.sh
View file

@ -133,4 +133,23 @@ echo "once upon a time there was a horse" >> file5
git add file5
git commit -m "fourth commit on master"
# git merge develop # should have a merge conflict here
# this is for the autostash feature
git checkout -b base_branch
echo "original1\noriginal2\noriginal3" > file
git add file
git commit -m "file"
git checkout -b other_branch
git checkout base_branch
echo "new1\noriginal2\noriginal3" > file
git add file
git commit -m "file changed"
git checkout other_branch
echo "new2\noriginal2\noriginal3" > file