I want to merge a branch but have it appear as 1 commit, without the other branch showing in master.
Right now, I can do a merge and uncheck(commit immediately and check commit even if FF).. This lets me have the commits in my working copy and allows me to create a new commit in master with my changes. But the history still shows the commit on the other branches even after deleting.
I want to do this, but not show the commits from the other branch, so I can keep committing all I want on separate branches but have this be nice and pretty on my master.
Can this be done?
I think this will be helpful.
Thanks, I tried a interactive rebase with sourcetree and squashed my commits but I noticed a file had some wrong changes included, so I didn't fully trust it. Maybe doing it in command line will give me different results.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.