Re: [git-users] Merge+rebase diverged branches

2014-08-04 Thread Gunnar Strand
Hi Gergely, On 08/03/14 17:46, Gergely Polonkai wrote: Thank you for your advice, Philip! Table, in this case, is a new major feature in the app, and parts of that feature are already pushed to get feedback, that's why I have pushed commits. We are following (more or less) the GitHub flow,

Re: [git-users] Merge+rebase diverged branches

2014-08-04 Thread Gergely Polonkai
I will try this next time, although you swapped my branches, I needed to merge master into table, not table into master. Actually as I thought this through, I didn't really need this, I could instead merge master into table at T4, I don't know why b wanted it this way… Well, at least I gave

Re: [git-users] Merge+rebase diverged branches

2014-08-03 Thread Philip Oakley
From: Gergely Polonkai To: git-users@googlegroups.com Sent: Sunday, August 03, 2014 2:09 PM Subject: [git-users] Merge+rebase diverged branches Hello, I have two branches, master and table, both went through some changes and have their respective tracking brances: M1! - M2! -

Re: [git-users] Merge+rebase diverged branches

2014-08-03 Thread Gergely Polonkai
Thank you for your advice, Philip! Table, in this case, is a new major feature in the app, and parts of that feature are already pushed to get feedback, that's why I have pushed commits. We are following (more or less) the GitHub flow, so master always works. Meanwhile these intermediate branches