Menu

Sardana GIT Merge Request #1: [TEST] document git repos (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Carlos Pascual wants to merge 0 commits from /u/cpascual/sardana/ to master, 2013-08-06

Updates docuentation on getting sardana and taurus from git instead of svn

NOTE: This is also test of the "request-merge" feature of sourceforge.

Commit Date  

Discussion

  • Carlos Pascual

    Carlos Pascual - 2013-08-06

    I did this as a test of the "merge-request" feature of sardana.
    Here is what I think of the "merge-request":

    PROs:

    -We get a pending merges button in the project page which shows a practical list of merge requests (pull requests). Nice for having a quick view of the current status and also to see history.

    -Each item in the list of merge requests allows its own discussion thread (similar to the discussions on a ticket). Less clutter in the mailing list.

    -The diffs can be shown as unified diff or side-by-side in the web page

    -Copy-pasteable commands are suggested for accepting the merge

    -It allows easy integration with our ticket system and wiki (e.g., linking to a certain bug [#20] or a wiki page [SEP7])

    -It is intuitive and easy to explain

    CONs:

    -It is sf.net specific (requires the fork to be done in sf.net)

    -It forces the contributor to interface through the web (as oppossed to doing everything from console and mail program) (... Frederic would hate us!)

     

    Related

    Wiki: SEP7
    Taurus: OLD Tickets: #194


    Last edit: Carlos Pascual 2013-08-06
  • Carlos Pascual

    Carlos Pascual - 2013-08-06

    Regarding the patch itself:

    I accepted the merge and merged (I know I should wait for another admin to approve my changes, but we are still in a transition phase and this patch is just about documentation)

     

Log in to post a comment.

Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.