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|
|Component:||Git||Assignee:||Ondrej Vrabec <ovrabec>|
|Severity:||normal||CC:||git, LumpyCustard, markiewb|
|Issue Type:||ENHANCEMENT||Exception Reporter:|
|Bug Depends on:||226545|
Description sparkee 2012-06-08 19:31:37 UTC
Git pull with rebase would be a really handy thing to have. When working on a large project with multiple developers, it is very useful for helping everybody ensure they are working against the master branch. See also similar bug reports 188685 and 206418 for Mercurial.
Comment 1 ymajoros 2013-01-14 12:20:32 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...
Comment 2 ymajoros 2013-01-14 12:53:55 UTC
(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
Comment 3 creechy 2013-02-13 16:54:44 UTC
+1 to this. Would drastically improve the usefulness of NetBeans with Git.
Comment 4 Ondrej Vrabec 2013-03-19 09:09:40 UTC
Comment 5 Quality Engineering 2013-03-20 02:06:42 UTC
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 <firstname.lastname@example.org> Log: #213855 - git pull --rebase when pull requires a merge commit, offering the option do the merge or rebase
Comment 6 markiewb 2013-08-01 15:19:04 UTC
Verified in 201307312300