Feature changed by: Adrian Schröter (adrianSuSE) Feature #308798, revision 4 Title: osc pull - fetch changes from an another branch Buildservice: Evaluation Priority Requester: Desirable - Projectmanager: Desirable + Projectmanager: Important Requested by: Michal Vyskocil (mvyskocil) Developer: Marcus Hüwe (marcus_h) Description: osc pull can be used for merging changes when the original developer did not send a submitrequest and a maintainer want to have his changes. The current existing approach is not easy - export a diff with his changes, apply them and commit - and it also break his branch. osc pull would do the same including repair of the origin package. Eg. Someone will update pidgin to new version, so home:branches:foo: GNOME:Factory/pidgin contains _link new_pidgin.tarball project.diff maintainer of pidgin calls osc pull home:branches:foo:GNOME: Factory/pidgin and the changes will be merged to the GNOME: Factory/pidgin and his branch will contain a _link. Discussion: #1: Adrian Schröter (adriansuse) (2010-01-21 12:40:05) it is indeed desirable, but not that easy to implement. Even though there is already an "osc pull", but this one only merge from the branch tree so far. + #2: Adrian Schröter (adriansuse) (2010-02-20 16:34:02) (reply to #1) + this should also work with conflicts (which need to be fixed manually + afterwards). + This is similar to "git merge" functionality, so maybe it should become + a "osc merge" command. -- openSUSE Feature: https://features.opensuse.org/308798