This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
| Summary: | git pull --rebase | ||
|---|---|---|---|
| Product: | versioncontrol | Reporter: | sparkee <sparkee> |
| Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
| Status: | VERIFIED FIXED | ||
| Severity: | normal | CC: | git, LumpyCustard, markiewb |
| Priority: | P3 | Keywords: | PLAN |
| Version: | 7.1.2 | ||
| Hardware: | PC | ||
| OS: | All | ||
| Issue Type: | ENHANCEMENT | Exception Reporter: | |
| Bug Depends on: | 226545 | ||
| Bug Blocks: | |||
|
Description
sparkee
2012-06-08 19:31:37 UTC
I volunteer for this as well. Could we just start from merge? I guess we then will some simple actions for handling rebase conflicts: continue/abort/skip rebase... (In reply to comment #1) > I volunteer for this as well. Could we just start from merge? I guess we then > will some simple actions for handling rebase conflicts: continue/abort/skip > rebase... Sorry, forget about this comment, one, it was intended for #221661 +1 to this. Would drastically improve the usefulness of NetBeans with Git. Integrated into 'main-golden', will be available in build *201303192300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/b811364bc5c5 User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #213855 - git pull --rebase when pull requires a merge commit, offering the option do the merge or rebase Verified in 201307312300 |