apache / apache/netbeans

git pull with rebase and autostash

Open
#9,321 3 comments 0 reactions 0 assignees View on GitHub
git kind:feature needs:triage
Dominant language
Java
Stars
3.1k
Forks
935
Avg merge
2d 3h
Merged PRs (30d)
17

Description

### Apache NetBeans version

Apache NetBeans 29

### What happened

I believe the GIT action/toolbar button "Pull from Upstream" is misleading. It's not using `git pull` action, but `git merge --ff`. I configured git globally (and repository specifically) to use rebase & autostash for pull by default and hoped the button will do exactly that. Sadly there's no pull button and no option to configure and change default behavior. I think current button could be renamed to fetch & merge (or just merge) and new button added with specifically the pull action (honoring global/repository default settings).

### Language / Project Type / NetBeans Component

Java Maven Project

### How to reproduce

Use GIT "Pull from Upstream" toolbar button or relevant menu action. Check output.

### Did this work correctly in an earlier version?

No / Don't know

### Operating System

Linux Mint MATE 22.3 (kernel 6.17.0-20-generic)

### JDK

Temurin-21.0.10+7

### Apache NetBeans packaging

Apache NetBeans binary zip

### Anything else

_No response_

### Are you willing to submit a pull request?

No

Contributor guide

Open the contributing guide

Research direction

Start by tracing the GIT “Pull from Upstream” toolbar and menu action, then compare its output with the configured repository and global rebase/autostash settings. Done means a distinct pull action honors those settings, while the existing action is labeled to describe its fetch-and-merge behavior.

Written by the indexing model from the issue text.

Assessment

Tech stack
git, java
Domain
devtools
Issue type
Feature
Difficulty
4/5
Estimated time
3-5 days
Activity status
Quiet
Clarity
Mostly clear
Newbie friendliness
55/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.