Hi, On Tue, Jul 17, 2018 at 4:53 PM, Ken Takata <[email protected]> wrote: > Hi Yegappan, > >> On Sat, Jul 14, 2018 at 12:22 PM, Yegappan Lakshmanan >> <[email protected]> wrote: >> > @yegappan pushed 30 commits. >> > >> >> When I tried to squash all the commits for this pull request into one >> using 'git rebase -i' and at the same time tried to rebase the branch, >> it messed up the commit log. How do I fix this? Any pointers? > > Did you try to squash the commits after you merged the master branch into > your branch? Mixing merge and rebase can cause troubles. > > You should rebase your commits on top of the latest master branch to fix this. > Try the following: >
Thanks for the detailed steps. I have fixed the commit history now by using the steps you have described below. Regards, Yegappan > > # Make the master branch up to date > git checkout master > git pull > > # Create a backup of the wininfo branch > git checkout wininfo > git branch wininfo-backup > > # Rebase your commits on top of master > git rebase -i master > > Then the following items will be shown in the editor: > > pick f36aadff3 Add neighbor window information to getwininfo() > pick 5701c833f Fix build failure with tiny version > pick d8fb1cf63 patch 8.1.0166: using dict_add_nr_str() is clumsy > pick 9c7ea5708 Add neighbor window information to getwininfo() > pick d47041f08 Fix sync conflict > > Remove the 3rd line which is not a part of your commits, then save and exit. > Conflict will be occurred. You need to fix it by: > git mergetool > git merge --continue > > If you would make a mistake and want to retry rebasing: > git rebase --abort > and/or: > git reset --hard wininfo-backup > > After you fixed the problem, push with "git push -f". > > > If you want to update your PR next time, you can do it in a similar way: > git checkout master > git pull > git checkout wininfo > (git branch wininfo-backup2 # If needed) > git rebase master > # fix conflict > > Regards, > Ken Takata > -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
