代码开发与GIT的合入流程

Thu, 27 Oct 2022 11:42:21 +0800

合入流程

开发之前

git checkout feature_dev_v1.0 先拉去最新代码 git pull origin feature_dev_v1.0 创建本地分支 git checkout -b xiuhua10-27

开发完成

git add . git commit -m msg

切换到develop

git checkout develop

更新 develop

git pull origin develop git merge xiuhua10-27 推送到远程发布到开发环境测试 git push origin develop

测试完成发起mr

git checkout xiuhua10-27 git push origin xiuhua10-27 基准分支 origin feature_dev_v1.0 对比分支xiuhua10-27

Ubuntu安装GitLab

Mon, 10 Oct 2022 16:48:40 +0800

1.安装必要软件包

1
2
3

sudo apt update
sudo apt upgrade
sudo apt install build-essential curl file git ca-certificates

2.下载GitLab软件包并安装

1
2

wget --content-disposition https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/bionic/gitlab-ce_14.1.2-ce.0_amd64.deb/download.deb
sudo dpkg -i gitlab-ce_14.1.2-ce.0_amd64.deb

3.启动GitLab实例

1
2
3

sudo gitlab-ctl reconfigure
sudo gitlab-ctl start
sudo gitlab-ctl status

4.配置防火墙

sudo ufw allow https
sudo ufw allow http
sudo ufw allow ssh
sudo ufw enable
sudo ufw status

5.访问GitLab Web界面

打开Web浏览器,访问http://Your-IP-address

GOGS on 软件开发大郭的技术博客