git 如何与开源项目同步同时保留自己的修改? - V2EX
billgreen1

git 如何与开源项目同步同时保留自己的修改?

  •  
  •   billgreen1 Nov 18, 2015 3506 views
    This topic created in 3828 days ago, the information mentioned may be changed or developed.

    关注了一个 git 的项目,但是得做一定的修改才能自己用。我想一边和项目同步,一边保留自己的修改,怎么做最好?不是不想 pull request ,一来自己写的差,二来对我有用的不一定对整个项目有用。

    7 replies    2015-11-18 09:49:33 +08:00
    Andiry
        1
    Andiry  
       Nov 18, 2015
    git rebase
    imyip
        2
    imyip  
       Nov 18, 2015 via Android
    fork 一份自己仓库?不时 fetch 关注的项目,然后手动 merge 到本地的仓库?
    Unknwon
        3
    Unknwon  
       Nov 18, 2015
    一般就是尽可能少得修改源文件,将自己的修改放置在新建的文件中,减少冲突的几率。然后定期向上游拉取变动,解决可能出现的冲突。
    greenskinmonster
        4
    greenskinmonster  
       Nov 18, 2015
    stage -> pull -> unstage
    greenskinmonster
        5
    greenskinmonster  
       Nov 18, 2015
    错了, stash -> pull -> unstash
    mahone3297
        6
    mahone3297  
       Nov 18, 2015
    @Unknwon 这个好像是唯一的办法。除了发 pr 请求合并,不合并的话,自己维护自己的版本,还要更新线上的功能,确实比较烦。
    About     Help     Advertise     Blog     API     FAQ     Solana     3202 Online   Highest 6679       Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 59ms UTC 14:36 PVG 22:36 LAX 07:36 JFK 10:36
    Do have faith in what you're doing.
    ubao msn snddm index pchome yahoo rakuten mypaper meadowduck bidyahoo youbao zxmzxm asda bnvcg cvbfg dfscv mmhjk xxddc yybgb zznbn ccubao uaitu acv GXCV ET GDG YH FG BCVB FJFH CBRE CBC GDG ET54 WRWR RWER WREW WRWER RWER SDG EW SF DSFSF fbbs ubao fhd dfg ewr dg df ewwr ewwr et ruyut utut dfg fgd gdfgt etg dfgt dfgd ert4 gd fgg wr 235 wer3 we vsdf sdf gdf ert xcv sdf rwer hfd dfg cvb rwf afb dfh jgh bmn lgh rty gfds cxv xcv xcs vdas fdf fgd cv sdf tert sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf shasha9178 shasha9178 shasha9178 shasha9178 shasha9178 liflif2 liflif2 liflif2 liflif2 liflif2 liblib3 liblib3 liblib3 liblib3 liblib3 zhazha444 zhazha444 zhazha444 zhazha444 zhazha444 dende5 dende denden denden2 denden21 fenfen9 fenf619 fen619 fenfe9 fe619 sdf sdf sdf sdf sdf zhazh90 zhazh0 zhaa50 zha90 zh590 zho zhoz zhozh zhozho zhozho2 lislis lls95 lili95 lils5 liss9 sdf0ty987 sdft876 sdft9876 sdf09876 sd0t9876 sdf0ty98 sdf0976 sdf0ty986 sdf0ty96 sdf0t76 sdf0876 df0ty98 sf0t876 sd0ty76 sdy76 sdf76 sdf0t76 sdf0ty9 sdf0ty98 sdf0ty987 sdf0ty98 sdf6676 sdf876 sd876 sd876 sdf6 sdf6 sdf9876 sdf0t sdf06 sdf0ty9776 sdf0ty9776 sdf0ty76 sdf8876 sdf0t sd6 sdf06 s688876 sd688 sdf86