Bryan,
Think it is definitely helpful to have.
In general, for other Github endeavors I do a branch on my fork and then
rebase and change history on that branch as needed. GitHub has been quite
good with detecting these changes for the PRs that are open as they evolve
and change.
Aldrin Piri
S
Oleg and Tony bring up good points. I'm wondering if we should add
something to the contributor guide about the recommended approach for
updating your pull request when addressing feedback?
Right now the rebase approach that is outlined is more geared towards
leading up to submitting the pull requ
“. . .I prefer doing it by hand in an editor, some part of me gets joy out of
deleting
<'s, ='s, and >>'s. I'm not sure what others do. . ."
same here ;)
> On Nov 4, 2015, at 8:58 AM, Tony Kurc wrote:
>
> Regardless of if you're using merge or rebasing then merge (rebasing is
> nic
Regardless of if you're using merge or rebasing then merge (rebasing is
nice because then you can generally fast-forward merge to your targeted
branch) generally conflicts arise. Getting used to some tool for managing
merge conflicts is very important in distributed development. I prefer
doing it b
Just to add to Bryan’s point, here is a more detailed writeup of Git-stuff that
I use for my other project, but the approach is identical to the one I use with
NiFi - https://github.com/hortonworks/dstream/wiki/Contributor-Guidelines
On Nov 4, 2015, at 8:32 AM, Bryan Bende
mailto:bbe...@gmail.c
Joe
I think you are referring to ‘squishing’ -
https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/
Is that correct or were you asking about something else?
Oleg
On Nov 4, 2015, at 8:15 AM, Joe Skora
mailto:jsk...@gmail.com>> wrote:
Ok, I've read numerous Github howto's, b
Joe,
One way to avoid the merge commits is to use rebase. I believe we have it
outlined here:
https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide#ContributorGuide-Keepingyourfeaturebranchcurrent
In short, you basically...
- checkout your master
- fetch upstream to get the latest a
Ok, I've read numerous Github howto's, but still don't feel like I've been
doing it quite right.
Assuming that I've cloned the 'apache/nifi' to 'myname/nifi', what is the
best way to integrate changes in 'apache/nifi'? Whatever process I've
followed so far has created another commit in my repo re
