nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Undo gitflow action

tobyjunker

Hi,

I am using sourcetree with gitflow for Xcode (iOS development). I thought I was ready to start a new release branch and so selected that option from gitflow menu. Then I realized that I am not ready yet, so I want to undo this action but don't know how to.

The simplest option would be to simply finish this release, but that would merge all my current changes from develop into master, but I don't want to do that yet, since I am not done with this release and I only want to merge into master when I am ready with the release, just as intended by gitflow.

The next option would be to switch my active branch back to develop and continue with the missing changes and then create a new release branch. However, then I still have the old release branch kicking around and I don't know how to get rid of it.

Thanks, Toby

Accepted answers

Timothy

I'm sure that you can just right click and delete the branch right?

All comments

Timothy

I'm sure that you can just right click and delete the branch right?

tobyjunker

It's unfortunately not quite that straightforward. Here are the choices when I right-click on the branch in question (it is the active branch):

However, if I make develop the active branch, then the context menu of the feature branch chnages to this:

So now, I can delete the branch. I am still wondering about gitflow. So far, I can of course finish the feature. Does the gitflow script keep a reference somewhere of active release branches, or does it simply check the structure to see if anything is called "release-" and offer choices accordingly? In the latter case it should be safe to simply delete.

The question is what ahppens to my commit history? I do have one commit to this branch. Will this not mess up the repository?

mberistain

Hello, i deleted the branch and it looks like it works perfectly. I'm not sure what will happen when I push my changes to the server.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

git-flow

recovery