Need to move changes to a branch

I commited some changes to my develop (center, purple) branch since the point in the screenshot (which may or may not be attached below, if not, it's at the link) marked Created beta release. I have since decided that the changes are too extensive, and want to move all changes on the center purple branch since Created beta release to their own branch. This would leave the develop branch as tagged at 3.6.1.4.

I'm somewhat new to git, and find rebase, etc. a bit overwhelming. I also don't want to hose my repository. Thanks for your help.

My Branches

1 answer

1 accepted

This widget could not be displayed.

There are two ways to do this.

Resetting develop to an older commit will leave a cleaner history, but will mess up any other developers who have already pulled the changes into their local copies of develop.

Reverting the changes will create a new commit that puts dev back at the desired state, which other developers will be able to pull seamlessly, but the history will still show that the changes were once in develop.

Either way, you should back up the local repo first, and do not push anywhere until you are 100% sure that you've got the result you want.

Thanks Seth.

Git refused to push, but I found an option on Assembla to allow --force. After enabling the option, I was able to push my deletions. For safety's sake, I turned it back off.

I wasn't sure how to save the changes that I made in the branch, so I just checked each one out and tar'ed the changed files.

Thanks for the help!

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

733 views 1 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you