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 <[email protected]<mailto:[email protected]>> 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
