Re: [git-users] Re: Help with rebase?

Hi Michael, Having some more time now, here`s a bit more elaborate answer, mentioning the rebasing flow, if you prefer that instead. On Saturday, March 25, 2017 at 2:22:09 AM UTC+1, Michael Gersten wrote: > > > So here is what I'm trying to do. > > "Master", in this case, is the rg3 (primary)

Re: [git-users] Re: Help with rebase?

Ok, I've just seen your reply. I'm not sure if what you described is the most convenient flow, but without changing it, in case you don't actually make commits on "merged-dish" and you want to go with merging, after updating "master" and/or "Dish" you may do: git branch -d merged-dish git

[git-users] Re: Help with rebase?

Two additional notes: 1) Note (*R6*) not using --onto parameter. 2) With rebase flow, the final merge may be given a `--no-ff` parameter, causing an explicit merge commit to be created instead of a fast-forward merge, giving this situation instead of previously shown (R12): (*R12a*)

Re: [git-users] Re: Help with rebase?

On 2017-03-24, at 6:08 PM, Igor Djordjevic wrote: > Hi Michael, > > On Thursday, March 23, 2017 at 10:10:02 PM UTC+1, Michael Gersten wrote: > I need help with the syntax of rebase. > > I have a branch, "Dish", that was branched off of master. This was about a >

[git-users] Re: Help with rebase?

Hi Michael, On Thursday, March 23, 2017 at 10:10:02 PM UTC+1, Michael Gersten wrote: > > I need help with the syntax of rebase. > > I have a branch, "Dish", that was branched off of master. This was about a > month ago. > > Making a new branch off master, and merging Dish into it, worked just