Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Change commit code to other branch (Sourcetree for Windows)

Hi!

I am newbie with this tool and Git.

I put a 'new' branch code in 'master' branch, how can I change it to put in the right place?

Thanks a lot!!!

Xavier

1 answer

That depends:

  1. If you haven't committed the change yet, you can just create a new branch (or check out another branch) right now and then commit. If there are conflicting changes in the other branch you can Stash your changes before switching, then Apply the stash again afterwards.
  2. If you have committed the change, but you haven't pushed it to anyone else, you can right-click on the commit *before* that commit and use the 'Reset branch to this commit' option to move the master branch backwards, undoing that commit. The default 'Mixed' mode should be used in the reset dialog so that your changes still exist in your local folder, they just become uncommitted again. Then, go to 1.
  3. If you've committed the change *and* you've pushed it, then you can't undo it because other people may have already seen it. You can copy the commit to the other branch by checking out the other branch then right-clicking that commit and selecting 'Cherry Pick'. This will copy that commit over to your other branch but won't undo it on master.

HTH!

Thank you for a very useful reply!

Regarding #3 it's really not possible to delete commits already pushed to origin? Even if I'm the only contributor?

Thanks!

Hey, very good explanation of the options. Thanks.

I need top go for option "2." but don't know whether to do this on master or on the branch the commit was meant to go to?

... think I just figured it with common sense. It's to be executed on the master and of course the right click needs to be on the previos entry (BEFORE the "wrong commit") ...

Thank you :)

Helped me a lot!

Thanks, exactly what I was looking for! :)

For the (2) scenario, is there a way to avoid re-commits? In Mercurial, you can change the working directory, change the branch, and then graft the commits over, rather than having to make new ones.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

3,195 views 19 18
Join discussion

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you