doucanshou6998 2014-02-05 00:12
浏览 78
已采纳

使用GitHub在现有网站上跟踪我自己和供应商的代码更改

I'm going to implement version control for a project via GitHub. It's a website using mostly PHP and JavaScript. And we're switching from one script to another. I'm using cPanel / ftp to access the files. I would prefer not to mess around with apache config files.

/home/website/ - home directory

/home/website/public_html/ - document root for website.com - has existing php script files which will be overwritten once the beta site is tested to be working properly

/home/website/public_html/beta.website.com/ - document root for beta.website.com - has existing php script files which have been minimally modified from the original vendor source. ie header / footer / config files.

/home/website/public_html/orig.website.com/ - a possible directory where I could update the original vendor files?

/home/website/public_html/addon-website.com/ - document root for another addon domain - completely separate website has nothing to do with the project

This script is to be used on many different websites. The difference would be in:

  • config files
  • template files
  • website specific changes

I have the original vendor source files on my local computer but no local web server. I need help in initial setup. How should I set things up so I can track all of the following:

  • track changes to the original vendor files done via patches and updates
  • track changes to 1 or many versions of the original script installed on different websites
  • track changes to a beta which has my own modifications to the vendor files
  • track website specific changes
  • push changes from vendor files to where I do my own modifications
  • push changes from my modifications to all different websites / website specific

I had a look at how do I maintain divergent code on github but I need more specific instructions than what is provided there. Should I even be trying to do this all in one repo with many branches / forks / whatever?

  • 写回答

1条回答 默认 最新

  • duanbamo0127 2014-02-05 01:38
    关注

    It would be beneficial to have an integration branch and each party to work on features that are merged there. This is the workflow that I developed with my colleagues and has worked out very well:

    http://dymitruk.com/blog/2012/02/05/branch-per-feature/

    For an introduction of Git itself, this is a very good resource:

    http://git-scm.com/docs

    本回答被题主选为最佳回答 , 对您是否有帮助呢?
    评论

报告相同问题?

悬赏问题

  • ¥15 Arcgis相交分析无法绘制一个或多个图形
  • ¥15 seatunnel-web使用SQL组件时候后台报错,无法找到表格
  • ¥15 fpga自动售货机数码管(相关搜索:数字时钟)
  • ¥15 用前端向数据库插入数据,通过debug发现数据能走到后端,但是放行之后就会提示错误
  • ¥30 3天&7天&&15天&销量如何统计同一行
  • ¥30 帮我写一段可以读取LD2450数据并计算距离的Arduino代码
  • ¥15 飞机曲面部件如机翼,壁板等具体的孔位模型
  • ¥15 vs2019中数据导出问题
  • ¥20 云服务Linux系统TCP-MSS值修改?
  • ¥20 关于#单片机#的问题:项目:使用模拟iic与ov2640通讯环境:F407问题:读取的ID号总是0xff,自己调了调发现在读从机数据时,SDA线上并未有信号变化(语言-c语言)