Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

done merging twice #358

Closed
gregorriegler opened this issue Jan 18, 2023 · 0 comments · Fixed by #367
Closed

done merging twice #358

gregorriegler opened this issue Jan 18, 2023 · 0 comments · Fixed by #367
Labels
bug Something isn't working

Comments

@gregorriegler
Copy link
Collaborator

gregorriegler commented Jan 18, 2023

mob done
  git fetch origin --prune
  git push --no-verify origin mob/main
  git checkout main
  git merge origin/main --ff-only
  git merge --squash --ff mob/main
  git merge --squash --ff mob/main
  git branch -D mob/main
  git push --no-verify origin --delete mob/main
> nothing was done, so nothing to commit

The command git merge --squash --ff mob/main is triggered twice consecutively

@gregorriegler gregorriegler added the bug Something isn't working label Jan 18, 2023
hollesse added a commit that referenced this issue Mar 9, 2023
#358 fixed printing git merge just once in mob done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant