When submitting a Merge Request (MR) for a project branch, there are three options: Merge, Rebase, and Squash.

What are the differences between these three options, and how should you choose? Here’s a summary.

Merge

The essence of Merge is creating a new commit node, with all commits from the source branch brought over. If there were initially three commits, after the Merge, four commit nodes will exist, with one being the Merge Commit. The commit created by Merge also carries the source branch’s commit information. Therefore, in many Git GUI tools, these details form a commit relationship graph.

Rebase and merge

Read more »

I learned about the tag’s custom target attribute during the technical weekly meeting, and here is my note.

MDN Specification

HTML target

Where to display the linked URL as the name for a browsing context (a tab, window, or <iframe>). The following keywords have special meanings for where to load the URL: _self, _blank, _parent, _top.

Read more »

What the bug is

When accessing the web page in Chrome, everything is normal, but the page crashes directly when the developer tools are opened. If the page is refreshed with the developer tools open, it crashes but usually loads and runs when the developer tools are closed.

Version: Chrome v130.0.6723.70. Version v129 usually works.

Code Analysis

Read more »

In projects, we often use many third-party NPM packages, such as Mousetrap. We usually encounter bugs that have not yet been fixed or merged by the official repository. So, what should we do in such cases? Here is a summary of the methods.

Fork the Repository and Follow the PR Process

You can fork the repository, modify the source code, submit a PR, and wait for the official team to merge and release a new package. This method is undoubtedly the best; it benefits and gives back to the community.

However, this approach’s downside is also quite noticeable. If the official longed and we urgently need the package, this solution may not be very suitable.

Adjust NPM Dependency Version

Read more »

When selecting a folder on Mac, right-clicking, and choosing to compress, the resulting ZIP package reports an error when submitted to the Chrome Store.

There was a problem uploading your file. Please try again.
Invalid package. Please make sure it is a valid zip file and the file manifest.json is at the root directory of the zip package.

Following the error message guidance:

  1. The ZIP package is invalid.
  2. The root directory of the ZIP package lacks the manifest file.

Troubleshooting

Read more »

I got the Apple Watch S4 in November 2018 and have used it for almost six years. The battery health has dropped to 77%. Considering that the latest Watch OS11 no longer supports the S4 and has been used for a long time, I decided to get the S10.

After using the S10 for a few days, I’ve compiled the pros and cons for your reference.

Purchased Version

First, let me explain the version I bought.

  • My S4 was the GPS 44mm version; this time, I chose the GPS 46mm version (the new version only comes in 42mm and 46mm).
  • Since the mainland China doesn’t support fast charging, I opted for another version. I chose the Macao version, priced at 3499MOP, equivalent to 3132CNY.
  • As for the color, I went with glossy black. Regarding paint chipping, I’ll have to see after using it for a while.
Read more »

I have been profoundly experiencing iPhone Mirroring for some time, and it has become a daily feature. Here, I will mark my usage experience.

Requirements

Let’s first talk about the main prerequisites for using this feature:

  1. macOS needs to be upgraded to Sequoia 15, and it must be an M-series Mac.
  2. iOS needs to be upgraded to iOS18.
  3. Bluetooth and Wi-Fi need to be enabled on both iPhone/Mac.

In short, both Mac and iPhone should be upgraded to the latest system versions.

Read more »

Finally, it has arrived! On October 3rd, ChatGPT released a new feature similar to Claude Artifacts, called Canvas. Here is a record of its usage instructions.

Limit

  1. Currently, Canvas is available only to ChatGPT Plus and Team users in a limited rollout. If the Canvas option is not yet available for you, please wait patiently.
  2. Corporate/Education users will have a limited rollout next week.
  3. The official version of Canvas will be available to free users.
  4. At the platform level, Canvas is currently only supported on the web version; it is not available on Mac or mobile apps.

We’ll be adding more to Canvas over time. ChatGPT Plus and Team users can try the beta starting today.

Read more »

Recently, OpenAI officially released the o1 model, claiming it to be the most potent AI model in history. At first, I didn’t understand what was so impressive about it, but after experiencing it purposefully, I discovered its power.

Here, I’ll mark down what I’ve learned about o1.

AGI Level System

First, let’s understand the level of classification OpenAI has made for AI capabilities. From this, we can sense that as the level increases, the capabilities become stronger.

Read more »
0%