July 28, 2025 1:54 PM, g4-l...@tonarchiv.ch (mailto:g4-l...@tonarchiv.ch) wrote:
Hi Jakub

July 28, 2025 1:37 PM, "Jakub Jelen" <jje...@redhat.com 
(mailto:jje...@redhat.com?to=%22Jakub%20Jelen%22%20<jje...@redhat.com>)> wrote:

For me not knowing much about windows (anymore), I am ok with the current 
state. The only suggestion would be to squash the fixup commit to the first one 
and try to clarify the commit message a bit. Something like following should do:

> session: add err messages for most common WSA error codes

Maybe you can give me some hint with this... I'm using git for a while, but 
this is my first MR.
What do I do with my local branch to make it one commit (instead of two)? I 
rebased a few times and force-pushed... So this should not show up in the log...
Ok I answer this myself after talking to copilot haha:

$ git log upstream/master..HEAD
Count the commits listed (=N)

$ git rebase -i HEAD~N
In commit edit:
- Leave the first line as pick
- Change all other lines from pick to squash (or just s)
- Edit the commit message; use one summary message for the squashed commit.

$ git push --force-with-lease

Wish me luck!

Reply via email to