Challenge when rebasing

This is what i get after debasing. please advise on the way forward

@gracebish are you squashing commits here into one ?

I am trying to squash my commits

then replace pick with squash on the commits you want to be squashed and write pick on the commit where you want other commits to be squashed into (usually top one). then save and exit so you can be directed to another window where you enter commit message. hope this helps

1 Like

with the interface above press I on your keyboard to activate the insert mode then move the cursor to the first commit above and replace PICK with the f =

> fixup <commit> = like "squash", but discard this commit's log message then press Esc key followed by :x and finally press Enter :cowboy_hat_face:

1 Like

You can also take a look through, it can be of help

1 Like

Hi @gracebish @gcliff @sharif

Its actually good to get to know how to squash the commits. But this is actually a feature in github it self. So like previously there is no need to squash just push the commits. The one who merge will have the ability to squash them with a one click :smiley:

But make sure to rebase you’re branch with the remote master always :smile:

1 Like