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/
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 Tu
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 com
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 b
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 b
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
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, pickin
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 m
