Re: [leaf-devel] LEAF rebase/merge

[Yves Blusseau]

Hi Erich,

the best is to merge the new-initrd branch into the maint or master.
In either case (merge or rebase) you need to resolve the conflicts.
There are no other alternative.

Yves

> Le 14 janv. 2016 à 08:10, Erich Titl  a écrit :
> 
> Hi Yves
> 
> KP has asked me to port my stuff from new-initrd to master. I would like
> to do that with a minimum of manual intervention, but I am a bit stuck
> with the way the LEAF project is built within the git repository.
> 
> The branch new-initrd is branched off tag 5.2.2. In the meantime maint
> and master have progressed. Now to me it would be logical to rebase
> new-initrd to maint before trying to either merge it to master or
> cherrypick the few changes. The thing that puzzles me most is the fact
> that some configuration files have changed names in the meantime, which
> will make a clean merge impossible.
> 
> I also read that rebasing a published branch is frowned upon.
> 
> What would you suggest to overcome all this?
> 
> Thanks
> 
> Erich


--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] LEAF rebase/merge

[Erich Titl]

Hi Yves

Am 14.01.2016 um 09:10 schrieb Yves Blusseau:
> Hi Erich,
> 
> the best is to merge the new-initrd branch into the maint or master.
> In either case (merge or rebase) you need to resolve the conflicts.
> There are no other alternative.

Pretty disappointing :-(

Is there a best practise strategy to avoid conflicts? With Git conflicts
appear to be inherent.

cheers

Erich



--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] LEAF rebase/merge

[Erich Titl]

Hi Andrew

Am 14.01.2016 um 11:04 schrieb Andrew:
> Hi.
> 
> Git conflict appears when there's two modifications of same code in 
> merged branches.
> 
> So only case of avoiding it - don't touch code which is modified in 
> other branch, that is impossible in real world :)

So I thought, anyway I am trying not to disturb too much

cheers

ET

--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Re: [leaf-devel] LEAF rebase/merge

[Andrew]

Hi.

Git conflict appears when there's two modifications of same code in 
merged branches.

So only case of avoiding it - don't touch code which is modified in 
other branch, that is impossible in real world :)

14.01.2016 10:20, Erich Titl пишет:
> Hi Yves
>
> Am 14.01.2016 um 09:10 schrieb Yves Blusseau:
>> Hi Erich,
>>
>> the best is to merge the new-initrd branch into the maint or master.
>> In either case (merge or rebase) you need to resolve the conflicts.
>> There are no other alternative.
> Pretty disappointing :-(
>
> Is there a best practise strategy to avoid conflicts? With Git conflicts
> appear to be inherent.
>
> cheers
>
> Erich
>
>
>
> --
> Site24x7 APM Insight: Get Deep Visibility into Application Performance
> APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
> Monitor end-to-end web transactions and take corrective actions now
> Troubleshoot faster and improve end-user experience. Signup Now!
> http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140
>
> ___
> leaf-devel mailing list
> leaf-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/leaf-devel


--
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311=/4140

___
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel