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 <uwe_kl...@web.de> 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 <dasch...@mixxx.org> >> 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" >>> <wrobertson1...@gmail.com>: >>> >>> 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
