matthiasblaesing commented on PR #5866:
URL: https://github.com/apache/netbeans/pull/5866#issuecomment-1550347489

   @pepness @juneau001 I think it would be good to squash this into a single 
commit. We had the situation in the past where it was necessary to revert a 
change and having a disconnected set of commits with intermittent merges makes 
that hard.
   
   Locally I did this:
   
   - `git fetch github`
   - `git checkout -b pr-5866 github/pr/5866`
   - `git rebase master`
   - added my own changes
   - `git rebase -i HEAD~9`
   
   Marked all commits as "squash", saved and updated the commit message to read
   
   ```
       NETBEANS-4035: CDI Bean as Named is not listed in xhtml for selection
       
       Closes: #4035
       Co-authored-by: José Contreras <[email protected]>
       Co-authored-by: Matthias Bläsing <[email protected]>
   ```
   
   and retained @juneau001 as author of the commit.
   
   The result can be observed here: 
https://github.com/matthiasblaesing/netbeans/commit/697d0320eaffbd054813a5d0c369bf5ebae47703
   
   What do you think about this?


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

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

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

Reply via email to