Skip to content
Snippets Groups Projects
Commit 338e4e5ba6dc authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

test-pull: add test for pulling branch deletion

parent 19d34b8f69da
No related branches found
No related tags found
No related merge requests found
......@@ -124,10 +124,10 @@
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
add a merge to the git repo
add a merge to the git repo, and delete the branch
$ cd gitrepo
$ git merge -m "Merge branch 'beta'" beta | sed 's/| */| /'
Merge made by the 'recursive' strategy.
beta | 1 +
1 file changed, 1 insertion(+)
create mode 100644 beta
......@@ -128,9 +128,11 @@
$ cd gitrepo
$ git merge -m "Merge branch 'beta'" beta | sed 's/| */| /'
Merge made by the 'recursive' strategy.
beta | 1 +
1 file changed, 1 insertion(+)
create mode 100644 beta
$ git branch -d beta
Deleted branch beta (was 9497a4e).
$ cd ..
pull the merge
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment