rebase my GitHub fork doesn't pull changes

Hi,

I'm using PyCharm for a while. I want to do is:

git pull --rebase "repository" branch_name

I can't find a way to do this then I found rebase my GitHub fork. I tried to do that but it

doesn't pull changes.

I don't know if "pull" in PyCharm is using --rebase or do the same thing but this is what I need.

Thanks.

11 comments
Comment actions Permalink

Do you actually have a GitHub fork or not? The normal way to pull changes in PyCharm is to use VCS | Update Project, which lets you choose whether to use rebase or merge.

0
Comment actions Permalink

Yes, I have a GitHub fork. But I didn't cloned it from PyCharm. It was in my computer already.

As far as I know, Update project updates the projects from origin. I want to update from upstream where I forked the repository.

0
Comment actions Permalink

Using "Update project" after "Rebase my fork" should get the changes from upstream into your local copy.

0
Comment actions Permalink

I tried that but it didn't work.

Firstly, I cloned from GitHub (in PyCharm).

Then I tried to rebase my github fork. It added remote upstream. In rebase GitHub screen:

branch: development

Interactive is ticked.

onto: refs/remotes/upstream/development

from:

merge strategy is <default>

With this settings I try to rebase. It says nothing to show in rebasing commits screen.

After I clicked start rebasing. It says: "Stopped rebasing because of error while rebasing (0/0).
Check vcs console for details."

At console: "14:30:12.804: git rebase -i -v -m refs/remotes/upstream/development
Nothing to do"

And update project does nothing.

At console it says: "14:31:33.507: git rev-list -1 development..origin/development"

and says: "all files are up to date"

I don't know if I'm doing something wrong.

Thanks.

0
Comment actions Permalink

Hello Kurt,

There seems to be several problems with the action.

I've opened several bugreports, we'll try to fix them soon.

You may track the progress by voting for them:

http://youtrack.jetbrains.com/issue/IDEA-85138

http://youtrack.jetbrains.com/issue/IDEA-85139

http://youtrack.jetbrains.com/issue/IDEA-65696

http://youtrack.jetbrains.com/issue/IDEA-85140

Anyway, there is a workaround:

1. Fetch the upstream remote manually (via the IDE "Fetch" action or from the command line).

2. Deselect "Interactive" from the rebase dialog.

3. If you don't have unpushed changes, you'll get the error "Stopped rebasing because of error while rebasing (0/0). Check vcs console for details".

    Ignore the error and go to the Version Control console. You'll see the correct output saying something like:  "Fast-forwarded master to refs/remotes/upstream/master."

0
Comment actions Permalink

Hi,

Workaround worked. But I just wonder, are you planning to adding rebase option to pull? It also will solve many things, I guess.

I voted for issues. When will we take the updated packages?

Thanks for help.

0
Comment actions Permalink

Hmm, actually I saw that.

So, when are you planning to release new version with that issues fixed?

Last issue was created about 1 year ago. I really like PyCharm but should have this

missing features.

By the way, thanks for fast replies.

0
Comment actions Permalink

We've just fixed

http://youtrack.jetbrains.com/issue/IDEA-85138

http://youtrack.jetbrains.com/issue/IDEA-85139

http://youtrack.jetbrains.com/issue/IDEA-65696

and the fixes will be available in PyCharm 2.5.1

Others will be fixed only in one of major releases (probably next one).

0
Comment actions Permalink

Yes, I saw them.

Thanks. There is a PyCharm 2.5.1 RC. Is that version includes that fixes?

When will 2.5.1 released? (I saw somewhere that next week, is that right?)

0
Comment actions Permalink

No, these fixes are not included to 2.5.1 RC.

I can't say exactly when 2.5.1 will be released, but I suppose it will be the next week.

0

Please sign in to leave a comment.