On Wed, Jul 11, 2012 at 01:07:10PM +0200, Myriam Schweingruber wrote:
> We already have rules for git, please have a look here:
> http://techbase.kde.org/Getting_Started/Sources/KDE_git-tutorial#Amarok_Developers
Yeah, but it does not cover managing personal clones and feature
branches.
--
Edwar
Hi all,
On Tue, Jul 10, 2012 at 3:01 PM, Matěj Laitl wrote:
> On 10. 7. 2012 Edward Toroshchin wrote:
>> G'day,
>>
>> On Tue, Jul 10, 2012 at 01:25:59PM +0200, Matěj Laitl wrote:
>> > I've checked above repo and the master branch there is polluted with many
>> > Merge branch 'master' of git://ano
> Agreed. And hey, I didn't know about merge.conflictstyle, that'll make my
> life
> much easier, thanks!
Anytime! Try also kdiff3 as mergetool.
--
Edward "Hades" Toroshchin
dr_lepper on irc.freenode.org
___
Amarok-devel mailing list
Amarok-devel@kde
On 10. 7. 2012 Edward Toroshchin wrote:
> On Tue, Jul 10, 2012 at 03:01:06PM +0200, Matěj Laitl wrote:
> > E.g. `git push` without --rebase in master may still be correct if you
> > don't have own commits so that it results in fast-forward, that's what I
> > wanted to say.
>
> I see. There is actu
On Tue, Jul 10, 2012 at 03:01:06PM +0200, Matěj Laitl wrote:
> Lucas' repo looks like it has no his own commits in master. Therefore I
> wanted
> to say: Shouldn't all his `git pull git://anongit.kde.org/amarok master`
> commands performed in his master branch have resulted in fast-forwards? (th
