develop
master
git fetch origin git checkout -b master origin/master git merge develop
src/wbb.txt
# Conflicts: # wonderful.txt
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
git fetch origin
git checkout -b master origin/master
git merge develop