Hi Ken, On Thu, May 26, 2016 at 4:53 AM, Ken Takata <[email protected]> wrote: > Hi Yegappan, > > 2016/5/26 Thu 13:07:15 UTC+9 [email protected] wrote: >> Hi all, >> >> I recently started using the github branches to track my changes to Vim. >> I have a question about syncing a feature branch to the upstream repository. >> >> I first created a clone of the Vim repository: >> >> https://github.com/yegappan/vim >> >> Next, I created a child branch for each of my change: >> >> https://github.com/yegappan/vim/branches >> >> After Bram released several patches recently, I synced my fork to the Vim >> repository. Now how do I sync (rebase) all of the feature branches? >> >> When I tried to rebase and push the changes back to one of the child branch, >> it created a commit with all the patches from the mainline. It shows up as >> though I committed all the changes. >> >> https://github.com/vim/vim/pull/830/commits >> https://github.com/vim/vim/pull/830/files >> >> What is the proper method to sync (rebase) the upstream changes to the >> feature >> branches in a fork? > > I saw your repository and found that you seem to commit the same change > three times. > https://github.com/yegappan/vim/commits/cfilter > d4546b36577e5f2724b00026fb6dd1a4021eab5c > baa9a75ee1194458263e9ebeeab8dd38cd88ad74 > 2bc08e56dd8877dbe7a2b3148dcb72465d456d64 > > I don't know how you create this commit tree, but this might cause the > problem. > To fix your problem, try the following. > > 1. Make a backup branch before fixing cfilter branch: > > $ git branch cfilter-backup cfilter > > 2. Discard duplicated commits. > > $ git checkout cfilter > $ git reset --hard 2bc08e5 > > This discards baa9a75, d4546b3 and related merge commits. > > 3. Force push the fixed branch. > > $ git push origin cfilter -f > (Assuming "origin" points your repo.) > > 4. Remove the backup branch. > You can remove the backup branch if everything seems good. > > $ git branch -D cfilter-backup >
Thanks for the above steps. I have fixed the commits in the cfilter branch. Regards, Yegappan -- -- 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.
