I've been using sourcetree with gitflow, my first steps with these tools.
In error I made and commited changes in the master branch which is now 'ahead' of the develop branch.
By ahead I simply mean that the files listed under master have changes in them that have never been in Develop - hence I am worried that if I now develop a feature branch from develop I am going to be doing so on a version that is less developed than the master and risk losing those changes when develop later gets merged to master on completing a new release.
The changes I made were good and I want to preserve them, and get back to creating new features as branches from the development branch, later merging them into the master as new releases.
What is the best way to get things back on track?
I am unclear about checking out... This page in the manual talks about checking out from a remote source to the local repository..
Is this what you mean?
My first reaction was to switch to the develop branch and hit the checkout button on the toolbar. It requested that I select the branch that I wish to change my working tree to... Is this what you mean?
Many thanks for your patience with somebody who is learning.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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!
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