I accidentally merged a PR from my development branch (subject-serve-image) into the main branch instead of my release branch (rc/04). I quickly reverted that PR, which created another PR. I merged the revert PR back into main. Afterward, I created a new PR from my dev branch to the release branch (rc/04), which worked fine.

I accidentally merged a PR from my development branch (subject-serve-image) into the main branch instead of my release branch (rc/04). I quickly reverted that PR, which created another PR. I merged the revert PR back into main. Afterward, I created a new PR from my dev branch to the release branch (rc/04), which worked fine.

In our git workflow we have two merge destinations: a dev branch which holds all the work from our finished feature branches, and a release branch where we left out some features that are not yet ready for practical use and apply some extra settings. These two branches diverged sometime in the past.

Is it possible to restart a git merge after committing the unresolved files?

I just went through a lengthy merge conflict and noticed that I have a bunch of commits from my working tree that should have been squashed before I did the merge. I have not pushed the merge yet but I would like to avoid having to re-do the merge after checking out a new branch and doing the squash.

I have a repo with some automation that’s failed badly. The automation should retrieve a file from the git repo, append “a record,” which is multiple lines, push up a new branch, open a pull/merge request for that branch to be merged to the default, and then automatically merge after a successful CI run. Failure in that last step has left me with 50 open, conflicting MRs.