nifi-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bryan Bende <>
Subject Re: Gitting the hub right
Date Wed, 04 Nov 2015 13:32:40 GMT

One way to avoid the merge commits is to use rebase. I believe we have it
outlined here:

In short, you basically...
- checkout your master
- fetch upstream to get the latest apache nifi master
- merge the upstream master to your master
- checkout your feature branch
- rebase your feature branch to your master, which essentially takes away
your commits on that branch, brings it up to date with master, and puts
back your commits


On Wed, Nov 4, 2015 at 8:15 AM, Joe Skora <> wrote:

> 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 related to merging
> the upstream changes, which confuses things when comparing my repo to
> upstream.
> Regards,
> Joe

  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message