[GitHub] [netbeans] ebresie commented on pull request #3074: [NETBEANS-189] Updates for Sql autocomplete

[GitBox <gi...@apache.org>]

ebresie commented on pull request #3074:
URL: https://github.com/apache/netbeans/pull/3074#issuecomment-1008333123


   Probably need some git/github help regarding integration of @matthiasblaesing  suggested changes mentioned here:
   
   > https://github.com/matthiasblaesing/netbeans/tree/pr-3074
   > 
   > I added a second changeset ([matthiasblaesing@c517348](https://github.com/matthiasblaesing/netbeans/commit/c5173486d4547142b8c3f76baf4393ba107b8bea)) on top of yours ([matthiasblaesing@5288810](https://github.com/matthiasblaesing/netbeans/commit/5288810a8642ec08bbd0d5d4c7b92567440d2549)).
   
   I pulled the above code locally (merged/addressed conflicts) and seems to work well locally so far, but what is the proper way to merge/commit/push these in?  In previous attempts when I've attempted this some differences/newer upstream changes showed unnecessary (upstream) changes in the PR (i.e. this is why my earlier PR was closed with this "clean PR" instead).  I'm trying to avoid this here.
   
   Is it possible in github to "merge matthias" pr into this PR in some way?  Is a new PR with all the changes needed?  
   
   Or should I merge in the upstream changes (maybe with a rebase), then bring in changes from matthias PR and commit them (to my local branch) then push to my sql branch which assume will update this pr?  Or wIll this result in some unrelevant (i.e. upstream changes) being included in the PR as well (hoping the rebase may reduce this but not sure)?
    
   If I merge them in, does that then credit me as the changes in the history?  What is the correct way to merge these and ensure proper credit (i.e. Mattias changes) get recorded in the history?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists