Iss3022

[roicos]

This fix #3022

[roicos]

I have the same problem with old commits again. Only last commit is related to the #3022 and it is in the new branch (iss3022), but the previous are (already merged) and they are in master branch. Please, hint me how to fix this?

[simonbrunel]

When you create a new branch, you need to start from upstream/master (assuming that the upstream remote refers to chartjs/Chart.js repository). If you don't have a remote for chartjs, add it:

git remote add upstream https://github.com/chartjs/Chart.js.git

Then, in your case, I would simply do a git remote update which will fetch all branches from all remotes (but you can fetch only the remotes/upstream/master branch if you prefer).

Creating a new branch from upstream/master:

git remote update
git checkout --no-track -b iss3022 remotes/upstream/master

Re-syncing with upstream/master (e.g. before submitting a PR):

git remote update
git rebase remotes/upstream/master

I prefer rebasing over merging to re-sync a PR, but it's debatable. If you rebase, don't forget to force push to your fork remote (which might certainly be origin).

git push origin iss3022 --force 

Once a PR is merged, delete the branch, remotely and locally. I think your issue is that you created a new branch from your local master branch which might not be synced with chartjs/master.

Note: I use a GUI on top of Git, so might not be the correct / optimal commands

[roicos]

I really create new branch from local master (git checkout -b iss3022), but before sync with remote/master like it is described here. The difference is in "git rebase remotes/upstream/master". I apply it and did "git push origin iss3022 --force" once again, but there are still 11 commits in the PR.

[simonbrunel]

The extra commits might be because we squashed your PR on merge: they still appear in your local master but not in the chartjs master. I would advice you to delete your local master branch (if you have no change in it), and re-create it from upstream: git checkout -b master remotes/upstream/master. If you want the master branch in your remote fork, then force push to origin.

I don't use the same process described in your link, I never work directly in master (always in different branches) and when I need to re-sync my local master (very rarely), I rebase it on remotes/upstream/master. If you start a new branch for an upstream PR (like this one), I don't think you should create it from your local master, but always from upstream/master.

The easiest way to fix that PR is that since it's a one line change, you can delete your local branch, recreate-it with the command in my previous message, do your change and force push to the same iss3022 remote branch.

[simonbrunel]

I cloned your fork and did a rebase of your iss3022 branch on top of remotes/upstream/master and it works by skipping the first 10 commits and picking the last one.

[roicos]

Ok, thank you for instructions. I prefer to recreate master because I had conflicts during rebase process. Now it's only one commit in PR)

[simonbrunel]

Glad that helped you :)

The fix LGTM, @etimberg what do you think?

We should make the commit message a bit more explicit when merging.

[etimberg]

@simonbrunel I am +1 to merge