Common branch operations of Git
catalog
Branch Management
1. Create and merge branches
1.2switch
2. conflict resolution
3. Branch management strategy
4. Branch strategy
5.Bug branch
6.Feature branch
7. Multi person cooperation
8. Push branch
9. Grab branch
10.Rebase
Branch Management
The branch is the parallel universe in sc ...
Posted by TecBrat on Sat, 20 Jun 2020 05:20:03 +0200
The implementation of custom command for uploading image in Typora
Typora is a mark down editor that I like very much. Usually, I write notes in typora before I post them on my blog. At this time, the pictures in md need to be copied one by one. In order to reduce these tedious operations, typora also supports the function of drawing bed, so we decided to operate it.
T ...
Posted by lucasw on Mon, 15 Jun 2020 07:31:19 +0200
Learn the overall structure of redux source code and deeply understand the principle of redux and its Middleware
1. Preface
Hello, I am Ruokawa . This is the eighth part of the whole learning source architecture series. The word "overall architecture" seems to be a little big. Let alone the overall structure of the source code. The main thing is to learn the overall structure of the code without going into the implementation of other specific f ...
Posted by drfate on Mon, 15 Jun 2020 04:06:57 +0200
Make full use of Git to cancel and improve project quality (recruitment at the end of the article)
0x001 general
An excellent front-end engineer must be an excellent engineer first; an excellent engineer must be responsible for every line of code he writes and every commit he submits. That said, I don't want to write a very large and comprehensive article, but I want to write some small things.
0x002 undo git add
We know that to submit a com ...
Posted by kkessler on Sat, 13 Jun 2020 11:39:17 +0200
Operation and maintenance to build CTFd online shooting range
CentOS7.2 build ctfd shooting range platform
reference resources
First, there is a 2-core 4G memory 30G disk with no interface in CentOS 7.2
Then network bridging mode
Configure the yum source of CentOS7 to be Alibaba's
1. Install git
yum provides git
yum -y install git
2. Install pip (with pi ...
Posted by svanderclock on Tue, 09 Jun 2020 08:32:52 +0200
Invalid pom file after idea clones project from git
Invalid pom file after idea clones project from git
When your idea pulls projects from git, projects that are cloned for the first time often report that pom files are not in maven format: as shown in the following figure
This is because Maven has not been set after getting down from git. Open File ...
Posted by crazylegseddie on Fri, 05 Jun 2020 10:15:17 +0200
Implement simple tomcat
Since our Web application is running in tomcat, the request must arrive at Tomcat first. Tomcat actually handles the request as follows.
First, provide Socket service
The start of Tomcat must be Socket service, but it only supports HTTP protocol!
In fact, we can expand our thinking here. Since Tomcat is based on Socket, what about BIO or NIO ...
Posted by Sesquipedalian on Mon, 11 May 2020 16:41:20 +0200
How to use Github hook for automatic deployment
Recently, I bought domain name and server by chance. It's not really a waste. In addition, I haven't owned my own personal website, so I plan to play on the server with hexo, so I don't have to worry about whether to use Github pages or Gitee pages. Of course, today's topic is not blog building, but how to use Github's hook to deploy blog code ...
Posted by CodeMama on Sun, 26 Apr 2020 04:50:10 +0200
Websocket live room chat tutorial - go easy to quickly implement chat room
This tutorial and the full set of source code have been open-source on the OSChina code cloud and will be updated continuously. Please visit the latest version https://gitee.com/goeasy-io/GoEasyDemo-Live-Chatroom.git
That fire has been broadcast live in the last two years. It's really indescribable! Often a friend asks, I want to realize a live ...
Posted by Zup on Tue, 21 Apr 2020 05:25:39 +0200
Python 3 standard library: base64 encoding binary data in ASCII
1. base64 encodes binary data in ASCII
The base64 module contains functions that transform binary data into a subset of ASCII suitable for transmission using the plain text protocol. Base64, Base32, Base16, and Base85 encode to convert 8-bit bytes into characters within the range of ASCII printable characters, leaving more bits to represent dat ...
Posted by Ne.OnZ on Sun, 12 Apr 2020 05:46:12 +0200