Re: [Mixxx-devel] Proper way to update PR's

2017-07-11 Thread Josep Maria Antolin 
Hello.

I believe that you are not getting the correct answer because the question
is not clear.

What I think that you want to do is get your copy up to date, being it a
branch or master.  There is this github page that you should read, although
I will explain it here too:
https://help.github.com/articles/syncing-a-fork/


Having "upstream" as the mixxx repository
Having a fork of master on your github repository
Having branches on your github repository:

First, ensure that your local clone of your repository knows where the
mixxx repository is. To do so, look here:
https://help.github.com/articles/configuring-a-remote-for-a-fork

Then the procedure is:

$ git fetch upstream
$ git checkout master
$ git merge upstream/master

The first command tells git to go and look on the repository configured as
upstream (which you should have configured as I've told above... You can
choose a different name).
The second command tells git to change your working copy to the master.
The third command tells git to merge what is on upstream/master ( which is
supposed to be mixxx master), with your working copy (which is supposed to
be your master).

Depending on the changes, this can be a fast-forward, or you might need to
solve conflicts.

Conflicts are solved by manually editing the files, and once the conflict
has been resolved, git add it  ( This is explained here:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
)


Once you have your master merged, you should push it to github. If you
needed to solve conflicts, you willl need to make a commit too.

($ git commit -m "merge to get up to date")
$ git push


Now, in order to update your branches, you can do so from your master
branch.

$ git checkout my-other-branch
$ git merge master
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] Proper way to update PR's

2017-07-10 Thread Be 
Fetch and merge the latest updates from the PRs you're interested in. If 
they don't have any merge conflicts you can just merge them one after 
the other.


On 07/10/2017 06:49 PM, Waylon Robertson wrote:

so... can someone provide me the correct commands for doing a three or
more PR merge?

On Tue, Jul 11, 2017 at 8:55 AM, Uwe Klotz  wrote:

You need to remember the base version of your commits to reapply them
without introducing unresolvable conflicts. Git even supports rebasing a
range of commits "onto" a new root commit. Your personal customizations
should always stay/land on top of the commit history. Creating a backup
branch before starting with such a branch reconstruction task is not a bad
idea ;)

I rebase the WriteAudioTags branch (PR #728) frequently on the current
master. It might serve you as a starting point to reduce the number of
required merge operations. This branch is also the base for most of my
contributions, which I need to backport on master before publishing a PR.

Kind regards, Uwe

On 10.07.2017 08:44, Waylon Robertson wrote:


huh.. im afraid this doesn't make sense.
hmm.. what i want to do, is merge several pulls into a branch.. and
keep master, and those pulls, up to date. I don't want to be
cherrypicking commits.

On Mon, Jul 10, 2017 at 5:48 PM, Daniel Schürmann 
wrote:


Hi Waylon,

I have not understand exactly how your state is, but it sounds like

git rebase -i

Is your friend.

It is best to have one branch per feature, splitted from an original
master
commit.

So you schould branch your messed up branch again.

git checkout -b feature_a

Then rebase it, picking only the related commits of feature a.

git rebase -i upstream/master

Now an editor opens an let you skip unrelated commits.

Then you can switch back to your messy branch and repeat this procedure
for
feature b.

I hope that helps.

Kind regards,

Daniel




Am 10.07.2017 6:37 vorm. schrieb "Waylon Robertson"
:

What is the proper way to update to master, for the pr's ive got
integrated into my source?
my source was created by first git checking out the master.. then i
pulled in ratings, git git pull with the pr number. Then i merged
master into it. I git pulled the WriteAudioTags pr, switched to it,
git merged ratings into WriteAudioTags, then i branched again, to
implement a local patch. Now, how do i bring all my PR's up to date?
or is it easier to restart my source from scratch?


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel




--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel




--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] Proper way to update PR's

2017-07-10 Thread Waylon Robertson 
so... can someone provide me the correct commands for doing a three or
more PR merge?

On Tue, Jul 11, 2017 at 8:55 AM, Uwe Klotz  wrote:
> You need to remember the base version of your commits to reapply them
> without introducing unresolvable conflicts. Git even supports rebasing a
> range of commits "onto" a new root commit. Your personal customizations
> should always stay/land on top of the commit history. Creating a backup
> branch before starting with such a branch reconstruction task is not a bad
> idea ;)
>
> I rebase the WriteAudioTags branch (PR #728) frequently on the current
> master. It might serve you as a starting point to reduce the number of
> required merge operations. This branch is also the base for most of my
> contributions, which I need to backport on master before publishing a PR.
>
> Kind regards, Uwe
>
> On 10.07.2017 08:44, Waylon Robertson wrote:
>>
>> huh.. im afraid this doesn't make sense.
>> hmm.. what i want to do, is merge several pulls into a branch.. and
>> keep master, and those pulls, up to date. I don't want to be
>> cherrypicking commits.
>>
>> On Mon, Jul 10, 2017 at 5:48 PM, Daniel Schürmann 
>> wrote:
>>>
>>> Hi Waylon,
>>>
>>> I have not understand exactly how your state is, but it sounds like
>>>
>>> git rebase -i
>>>
>>> Is your friend.
>>>
>>> It is best to have one branch per feature, splitted from an original
>>> master
>>> commit.
>>>
>>> So you schould branch your messed up branch again.
>>>
>>> git checkout -b feature_a
>>>
>>> Then rebase it, picking only the related commits of feature a.
>>>
>>> git rebase -i upstream/master
>>>
>>> Now an editor opens an let you skip unrelated commits.
>>>
>>> Then you can switch back to your messy branch and repeat this procedure
>>> for
>>> feature b.
>>>
>>> I hope that helps.
>>>
>>> Kind regards,
>>>
>>> Daniel
>>>
>>>
>>>
>>>
>>> Am 10.07.2017 6:37 vorm. schrieb "Waylon Robertson"
>>> :
>>>
>>> What is the proper way to update to master, for the pr's ive got
>>> integrated into my source?
>>> my source was created by first git checking out the master.. then i
>>> pulled in ratings, git git pull with the pr number. Then i merged
>>> master into it. I git pulled the WriteAudioTags pr, switched to it,
>>> git merged ratings into WriteAudioTags, then i branched again, to
>>> implement a local patch. Now, how do i bring all my PR's up to date?
>>> or is it easier to restart my source from scratch?
>>>
>>>
>>> --
>>> Check out the vibrant tech community on one of the world's most
>>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>>> ___
>>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
>>> http://mixxx.org
>>>
>>>
>>> Mixxx-devel mailing list
>>> Mixxx-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>>>
>>>
>>
>> --
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> ___
>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
>> http://mixxx.org
>>
>>
>> Mixxx-devel mailing list
>> Mixxx-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>
>
>
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] Proper way to update PR's

2017-07-10 Thread Uwe Klotz 
You need to remember the base version of your commits to reapply them 
without introducing unresolvable conflicts. Git even supports rebasing a 
range of commits "onto" a new root commit. Your personal customizations 
should always stay/land on top of the commit history. Creating a backup 
branch before starting with such a branch reconstruction task is not a bad 
idea ;)


I rebase the WriteAudioTags branch (PR #728) frequently on the current 
master. It might serve you as a starting point to reduce the number of 
required merge operations. This branch is also the base for most of my 
contributions, which I need to backport on master before publishing a PR.


Kind regards, Uwe

On 10.07.2017 08:44, Waylon Robertson wrote:

huh.. im afraid this doesn't make sense.
hmm.. what i want to do, is merge several pulls into a branch.. and
keep master, and those pulls, up to date. I don't want to be
cherrypicking commits.

On Mon, Jul 10, 2017 at 5:48 PM, Daniel Schürmann  wrote:

Hi Waylon,

I have not understand exactly how your state is, but it sounds like

git rebase -i

Is your friend.

It is best to have one branch per feature, splitted from an original master
commit.

So you schould branch your messed up branch again.

git checkout -b feature_a

Then rebase it, picking only the related commits of feature a.

git rebase -i upstream/master

Now an editor opens an let you skip unrelated commits.

Then you can switch back to your messy branch and repeat this procedure for
feature b.

I hope that helps.

Kind regards,

Daniel




Am 10.07.2017 6:37 vorm. schrieb "Waylon Robertson"
:

What is the proper way to update to master, for the pr's ive got
integrated into my source?
my source was created by first git checking out the master.. then i
pulled in ratings, git git pull with the pr number. Then i merged
master into it. I git pulled the WriteAudioTags pr, switched to it,
git merged ratings into WriteAudioTags, then i branched again, to
implement a local patch. Now, how do i bring all my PR's up to date?
or is it easier to restart my source from scratch?

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] Proper way to update PR's

2017-07-10 Thread Uwe Klotz 
You need to remember the base version of your commits to reapply them 
without introducing unresolvable conflicts. Git even supports rebasing a 
range of commits "onto" a new root commit. Your personal customizations 
should always stay/land on top of the commit history. Creating a backup 
branch before starting with such a branch reconstruction task is not a bad 
idea ;)


I rebase the WriteAudioTags branch (PR #728) frequently on the current 
master. It might serve you as a starting point to reduce the number of 
required merge operations. This branch is also the base for most of my 
contributions, which I need to backport on master before publishing a PR.


Kind regards, Uwe

On 10.07.2017 08:44, Waylon Robertson wrote:

huh.. im afraid this doesn't make sense.
hmm.. what i want to do, is merge several pulls into a branch.. and
keep master, and those pulls, up to date. I don't want to be
cherrypicking commits.

On Mon, Jul 10, 2017 at 5:48 PM, Daniel Schürmann  wrote:

Hi Waylon,

I have not understand exactly how your state is, but it sounds like

git rebase -i

Is your friend.

It is best to have one branch per feature, splitted from an original master
commit.

So you schould branch your messed up branch again.

git checkout -b feature_a

Then rebase it, picking only the related commits of feature a.

git rebase -i upstream/master

Now an editor opens an let you skip unrelated commits.

Then you can switch back to your messy branch and repeat this procedure for
feature b.

I hope that helps.

Kind regards,

Daniel




Am 10.07.2017 6:37 vorm. schrieb "Waylon Robertson"
:

What is the proper way to update to master, for the pr's ive got
integrated into my source?
my source was created by first git checking out the master.. then i
pulled in ratings, git git pull with the pr number. Then i merged
master into it. I git pulled the WriteAudioTags pr, switched to it,
git merged ratings into WriteAudioTags, then i branched again, to
implement a local patch. Now, how do i bring all my PR's up to date?
or is it easier to restart my source from scratch?

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] Proper way to update PR's

2017-07-10 Thread Waylon Robertson 
huh.. im afraid this doesn't make sense.
hmm.. what i want to do, is merge several pulls into a branch.. and
keep master, and those pulls, up to date. I don't want to be
cherrypicking commits.

On Mon, Jul 10, 2017 at 5:48 PM, Daniel Schürmann  wrote:
> Hi Waylon,
>
> I have not understand exactly how your state is, but it sounds like
>
> git rebase -i
>
> Is your friend.
>
> It is best to have one branch per feature, splitted from an original master
> commit.
>
> So you schould branch your messed up branch again.
>
> git checkout -b feature_a
>
> Then rebase it, picking only the related commits of feature a.
>
> git rebase -i upstream/master
>
> Now an editor opens an let you skip unrelated commits.
>
> Then you can switch back to your messy branch and repeat this procedure for
> feature b.
>
> I hope that helps.
>
> Kind regards,
>
> Daniel
>
>
>
>
> Am 10.07.2017 6:37 vorm. schrieb "Waylon Robertson"
> :
>
> What is the proper way to update to master, for the pr's ive got
> integrated into my source?
> my source was created by first git checking out the master.. then i
> pulled in ratings, git git pull with the pr number. Then i merged
> master into it. I git pulled the WriteAudioTags pr, switched to it,
> git merged ratings into WriteAudioTags, then i branched again, to
> implement a local patch. Now, how do i bring all my PR's up to date?
> or is it easier to restart my source from scratch?
>
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>
>

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel