Use gimerge -- branch conflict handling

Version control system is responsible for managing submissions from multiple submitters (usually developers). Sometimes multiple developers may edit the same part of the content. Once developer A edits what developer B is editing, A conflict will arise. In order to reduce the probability of conflict, developers will work in separate branches. T ...

Added by mikelmao on Mon, 28 Feb 2022 15:53:59 +0200

Jenkins+Docker+Gitee+SpringBoot Automated Deployment

When we use the traditional development method to develop the background system, we need to re run the project every time we write a function point, and then test it. If the project is relatively small, it is OK, but if the project is relatively large, this development method is more troublesome due to the large number of personnel involved. Ba ...

Added by amethyst42 on Mon, 28 Feb 2022 14:04:33 +0200

Microservices have everything from code to k8s deployment (k8s deployment)

We will use a series to explain the complete practice of microservices from requirements to online, from code to k8s deployment, from logging to monitoring. The whole project uses the micro services developed by go zero, which basically includes go zero and some middleware developed by relevant go zero authors. The technology stack used is bas ...

Added by darktimesrpg on Fri, 25 Feb 2022 03:34:11 +0200

Git series tutorial git basic operation 4

Git basic operation Git's job is to create and save snapshots of your project and compare them with subsequent snapshots. This chapter describes the commands for creating and submitting snapshots of your project. Git commonly uses the following six commands: git clone, git push, git add, git commit, git checkout and git pull, which will be d ...

Added by weekenthe9 on Thu, 24 Feb 2022 03:48:07 +0200

Once you see it, you will have a nanny level tutorial and build a personal blog in 10 minutes

If you are Xiaobai, this set of information can help you become a big bull. If you have rich development experience, this set of information can help you break through the bottleneck 2022web full set of video tutorial front-end architecture H5 vue node applet Video + data + code + interview questions. preface I believe many people want to h ...

Added by johnb352 on Sun, 20 Feb 2022 21:31:40 +0200

Getting started guide for gitlab to quickly master daily needs

1. Premise jenkins plug-in address: http://updates.jenkins-ci.org/download/plugins/ 192.168.211.90 gitlab,jenkins,Maven192.168.211.91 git,httpd192.168.211.92 nexus,sonarqube,docker-ce 192.168.211.93 this is a separate environment for testing jenkins and docker Turn off the firewall # systemctl disable firewalld.service close Networ ...

Added by McMaster on Sun, 20 Feb 2022 13:48:07 +0200

Add gitee (code cloud) connection to your project - a Git note

1. Install Git Go to Git official website( https://git-scm.com/ )Download Git and click exe to install mindlessly. If you want to change the installation path, please follow the principle by yourself. 2. Configure Git Configure your global Git user name and mailbox git config --global user.name "Jajison" git config --global user.email "139 ...

Added by Archangel915 on Sat, 19 Feb 2022 02:56:57 +0200

[learn and forget] git operation - 19. git diff command

1. git diff command description Before commit ting, we usually need to determine where we changed the code and see if there is any misoperation code. At this time, the display of git status command is relatively simple, just listing the modified files. If you want to see what has been modified, you can use git diff command. Show how many ...

Added by dianaqt on Fri, 18 Feb 2022 02:26:12 +0200

Build Rails development environment

Even for experienced developers, it takes several twists and turns to install Ruby, Rails, and related software. These problems are caused by the diversity of the environment. Different operating systems, version numbers, text editors, etc. will lead to different environments. For developers with Rails development experience, most of them wil ...

Added by djfox on Thu, 17 Feb 2022 23:58:46 +0200

DVC use case: Data Registry

One of the main purposes of DVC repository is version control of data and model files. DVC also supports the reuse of these data artifacts across projects. This means that your project can rely on data from other DVC repositories, just like a package management system for data science. We can build a DVC project dedicated to version control ...

Added by Wolf_22 on Sun, 13 Feb 2022 15:46:22 +0200