Directory 1 Three areas for git file storage 2 git simple submission format and query and modification of three location files 3 git rebase 4 git merge 5 Differences between merge and rebase 6 git stash 7 Applications under development 1 Three areas for git file storage Git’s file storage is divided into three areas, […]
Tag: rebase
[SwiftUI module] 0060, SwiftUI builds an Instagram-like App based on Firebase Part 2/7 – Building TabBar
SwiftUI module series – 60 articles updated SwiftUI Projects – 5 projects updated Previous Demo source code downloads Technology: SwiftUI, SwiftUI4.0, Instagram, Firebase Operating environment: SwiftUI4.0 + Xcode14 + MacOS12.6 + iPhone Simulator iPhone 14 Pro Max SwiftUI builds an Instagram-like App based on Firebase Part 2/7 – Building TabBar Overview detailed 1. Operation effect […]
The difference between git merge and git rebase
There are two ways to merge code on Git: git merge and git rebase. Prerequisite knowledge points Master branch: First of all, the code base should have one and only one master branch. All official versions available to users are released on this master branch. This branch is called the Master branch; Develop branch: The […]
[Git] Git rebase and the difference between rebase and merge
Git rebase 1. Rebase – rebase There are two main ways to integrate changes from different branches in Git: merge and rebase. merge has been introduced in the previous article. Here we will learn another command rebase. Basic operations of rebasing Looking back at an example from the previous branch merging, in this example, we […]
Jetpack Compose Firebase Cloud Message Access Guide
Introduction Firebase Cloud Messaging (FCM) is a cloud messaging service provided by Google that helps developers send push notifications and real-time messages to mobile devices, websites, and server applications. It provides developers with a simple and powerful way to interact with users whether they are inside or outside the app. Firebase console official website Send […]
git rebase merges multiple commits
During the development process, there are usually countless commits locally, and multiple commits with the same function can be merged to keep the history concise. 01 git rebase command use git rebase –help # Count 3 versions from the HEAD version $ git rebase -i HEAD~3 # Merge the specified version number (not including this […]
A new technical director, prohibit us from using Git rebase! ?
△Hollis, a person who has a unique pursuit of Coding△ This is Hollis’s 429 original share Author l Hollis Source l Hollis (ID: hollishuang) In Git, merge and rebase are two different code merging strategies that are used to merge changes from one branch into another. The main difference between them is the way of […]
Use rebase for multi-person collaborative development
Use rebase for multi-person collaborative development 1. Master branch preparation # master branch cd um git init touch a.txt git add a.txt git commit -m “add a.txt” touch b.txt git add b.txt git commit -m “add b.txt” touch c.txt git add c.txt git commit -m “add c.txt” touch d.txt git add d.txt git commit -m […]
[Tool] Integrate the Firebase push function in the python project
Background introduction At present, the app push function is very common, and almost all apps have a push function. The push function can be implemented by yourself, or you can use the push service provided by a third party (both free and charged). This article mainly introduces the push service Firebase Cloud Messaging (FCM for […]
Git branch – rebase
forward from: Git branch-merge @https://git-scm.com Git branch – rebase Rebasing There are two main ways to integrate changes from different branches in Git: merge and rebase. In this section we’ll learn what “rebase” is, how to use it, show what’s amazing about this operation, and point out when you should avoid using it. Basic operation […]