It's not the same without you
Join the community to find out what other Atlassian users are discussing, debating and creating.
Here's what my graph looks like:
Screen Shot 2015-01-11 at 11.03.48 PM.png
I want to keep the feature/deployScripts branch, but I want it to have all the latest code from develop. I assume I need to rebase, or do I right-click on develop and "Merge develop into feature/deployScripts"?
You can do either of those. The difference between the two is how the history graph will look afterwards. (If you want to see, create a copy of your clone folder and do the rebase in one of the copies, the merge in the other.)
(On your screenshot, it seems that the feature/deployScripts branch is not checked out, first you need to check that branch out.)
Can you explain more about the history. I went with merge and when I look at branch's history it's the same as the branch I merged from so it's clean but shows an accurate history. I should mentioned that I squashed my commits first. So all in all I'm happy with the result. Any downsides to doing it this way? If it rebased instead how would the history be different?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
First of all, since you only had one unique commit in your branch, the squash did not really do anything (it would combine your commits into one). The rebase/merge story is a rather long one. It is quite well explained here: http://git-scm.com/book/en/v2/Git-Branching-Rebasing
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
I squashed before I sent the screenshot. :-) Thanks for the link. I'll check it out.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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 groupConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.
Start an AUGYou're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.