Re: [git-users] How to handle a longrunning branch

2015-11-18 Thread Konstantin Khomoutov
On Tue, 17 Nov 2015 23:47:13 -0800 (PST) mike wrote: > > > I have had a branch, feature_xyz, for a long time ( yes I know I > > > should not but it was not my call). Problem is I have not updated > > > it with changes from master. So I started to do a regular rebase

Re: [git-users] How to handle a longrunning branch

2015-11-18 Thread Johannes Müller
Hi, There is no way around resolving the conflicts if you want to keep your history. But there are strategies that can simplify the process. To decrease the number of conflicts you need to resolve, you can first interactively rebase your branch and "squash" successive commits. This means you

Re: [git-users] How to handle a longrunning branch

2015-11-18 Thread Magnus Therning
On Tue, Nov 17, 2015 at 10:02:03AM -0800, mike wrote: > Hi, > > I have had a branch, feature_xyz, for a long time ( yes I know I should not > but it was not my call). Problem is I have not updated it with changes from > master. So I started to do a regular rebase ( i want to keep history): > >

Re: [git-users] How to handle a longrunning branch

2015-11-17 Thread Konstantin Khomoutov
On Tue, 17 Nov 2015 10:02:03 -0800 (PST) mike wrote: > I have had a branch, feature_xyz, for a long time ( yes I know I > should not but it was not my call). Problem is I have not updated it > with changes from master. So I started to do a regular rebase ( i > want

Re: [git-users] How to handle a longrunning branch

2015-11-17 Thread mike
Den tisdag 17 november 2015 kl. 19:40:15 UTC+1 skrev Konstantin Khomoutov: > > On Tue, 17 Nov 2015 10:02:03 -0800 (PST) > mike wrote: > > > I have had a branch, feature_xyz, for a long time ( yes I know I > > should not but it was not my call). Problem is I have not