teleren/devto huggingface dataset:
GIT: rebase VS merge (simple)
Tags: git, programming, kristiyanvelkov, tutorial
Published: 2023-06-09 08:00:39

A short and simple explanation about git rebase vs git merge.

![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/rt5luc49ypthk058t9ab.gif)
---

### What Is Git Rebase?

![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/rjfzpgx0yoa5cmwnawq2.gif)


- **git rebase** is a powerful Git command that allows you to incorporate changes from one branch into another. It is often used to update a feature branch with the latest changes from the main branch before merging it back. Essentially, it allows you to replay a series of commits on top of a different commit.

---
### What Is Git Merge?
![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/hri1br2v2f1gopr82ucx.gif)


- **git merge** command is used in Git to integrate changes from one branch into another. It allows you to combine the changes made in one branch with the changes in another branch, resulting in a new commit that represents the merge of both branches.

---

### Differences between merge and rebase? 

- The resulting tree structure of the history (generally only noticeable when looking at a commit graph) is different (one will have branches, the other won't).

- Merge will generally create an **extra commit**.
- Merge and rebase will handle conflicts differently. Rebase will present conflicts one commit at a time where merge will present them all at once.

![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/35swte0qqmu2ouszjtzz.png)

---

![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/fmokyvddd16h3mhpy6n6.png)

---
### Usefull Links

-  [Merging vs. Rebasing](https://www.atlassian.com/git/tutorials/merging-vs-rebasing)

- If you want to practice git commands: [Git - Resources for visual learners](https://dev.to/kristiyan_velkov/git-resources-for-visual-learners-4m4i)

---

![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/c2zcidciydse9dofz4fs.png)


[![linkedin](https://img.shields.io/badge/linkedin-0A66C2?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/kristiyan-velkov-763130b3/)

<a href="https://revolut.me/kristiyanvelkov" target="_blank">
![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/rxmsw2d2ooukhdg8x5ar.png)
</a>

If you like my work and want to support me to work hard, please donate via:

<a href="https://revolut.me/kristiyanvelkov" title="Link to Revolut">Revolut website payment</a> or use the QR code above.                                                                                                                           


**Thanks a bunch for supporting me! It means a LOT 😍**
We AppIt: Your Ultimate Guide to Android App Development Solutions
Tags: androidappdevelopment, mobileappdevelopment, appdevelopmentsolutions, softwaredevelopmentguide
Published: 2023-06-09 07:43:55

Looking for expert guidance and solutions for **[Android app development](https://www.weappitright.com/android-app-development)** Look no further than We AppIt! As a leading company in the industry, we offer the ultimate guide to Android app development solutions. Our team of skilled developers and designers is dedicated to transforming your ideas into powerful mobile applications that drive business growth. With our comprehensive approach, we take you through every step of the development process, from conceptualization and design to testing and deployment. Whether you're a startup or an established enterprise, our custom Android app solutions are tailored to meet your specific needs. Stay ahead of the competition and unlock the potential of Android with We AppIt as your trusted development partner.
How to manage work with healthcare?
Published: 2023-06-09 07:51:28

There is a saying that health is wealth. So, as the phrase means healthcare is important to grow and succeed. There is no rocket science in it. It does not need a specific time or place to contribute on healthcare. Healthcare can be done within in your work schedule. Take the stairs instead of lift, walk while going to the office if it is a short distance, avoid junk foods and alcohol, etc.  There can be a lot of ways to do healthcare instead of going to the gym. 

In today’s date, many people experience physical discomfort in their workplace. It can be due to constant sitting in one place, wrong posture, etc. Severe physical discomfort can be addressed with muscle relaxers and correcting the habits that contributes to such discomfort.  Such **[pain treatments](https://remedycounter.com/body-pain-treatment/)** are recommended by the physicians as well.
c++, check object class type
Tags: dynamiccast, cpp, typeid
Published: 2023-06-09 07:47:26

In C++, we can check the type of an object at runtime using the typeid operator or the dynamic_cast operator.

```cpp
#include <iostream>
#include <typeinfo> // for typeid 
using namespace std;
class Base {
public:
    virtual ~Base() {}
};
class Derived : public Base {
};
int main() {
    Base* basePtr = new Derived();
    if (typeid(*basePtr) == typeid(Derived)) {
        cout << "basePtr is an instance of Derived class" <<endl;
    } else {
        cout << "basePtr is not ..." <<endl;
    }
    delete basePtr;
    return 0;
}
```
or dynamic_cast

```cpp
#include <iostream>
using namespace std;
class Base {
public:
    virtual ~Base() {}
};
class Derived : public Base {
};
int main() {
    Base* basePtr = new Derived();
    if (Derived* d_ptr = dynamic_cast<Derived*>(basePtr)) {
        cout << "basePtr is an instance of Derived class" <<endl;
    } else {
        cout << "basePtr is not ..." <<endl;
    }
    delete basePtr;
    return 0;
}
```
Stainless steel flanges & pipe fittings manufacturer
Published: 2023-06-09 07:20:31

[Sanjay Metal India](https://sanjaymetalindia.com/) is a leading manufacturer and exporter of high-quality [Stainless Steel Flanges](https://sanjaymetalindia.com/stainless-steel-flanges-manufacturer-india/), [Stainless Steel Pipe Fitting](https://sanjaymetalindia.com/stainless-steel-pipe-fittings-manufacturer-india/), Stainless Steel Ring, Stainless Steel Circle, and Stainless Steel Plates in different standards like ANSI, ASME, BS, DIN, API, etc. Products are used in a variety of industries, from small, basic industries such as Textile, Paper, Dairy, Cement, Engineering, and Sugar, to more complex industries such as Petrochemicals, Oil & Gas, Power, Onshore & Offshore.
How to send Email In SpringBoot | SpringBoot Tutorial
Tags: spring, springboot, java, programming
Published: 2023-06-09 07:20:20

This is a latest guide on how to send Email in your SpringBoot Application. Simply follow these steps to make your Spring Application be able to send Email.

### Step 1: Add Project Dependency
```xml
<dependency>
 <groupId>org.springframework.boot</groupId>
 <artifactId>spring-boot-starter-mail</artifactId>
</dependency>
```

### Step 2: Set up App Password inside your Google Account
- Go to (Google Account)[https://myaccount.google.com]
- On Search Bar, search for App Passwords then you should see **App Passwords** with **Security** under it
- Under **Select App**, find **Other (Custom Name)**, input your desired name then click **Generate**
- Copy the password we will use it later

### Step 3: Set up Application.properties
```xml
spring.mail.username=youremail@gmail.com
spring.mail.properties.mail.smtp.starttls.required=true
spring.mail.host=smtp.gmail.com
spring.mail.port=587
spring.mail.password=Copied Password From App Password
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.transport.protocol=smtp
spring.mail.properties.mail.smtp.starttls.enable=true
```

### Step 4: Configure Bean for JavaMailSender
```java
@Configuration
public class MailConfiguration {

    @Bean
    public JavaMailSender getJavaMailSender() {
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
        mailSender.setHost("smtp.gmail.com");
        mailSender.setPort(587);

        mailSender.setUsername("your@gmail.com");
        mailSender.setPassword("copiedPassword");

        Properties props = mailSender.getJavaMailProperties();
        props.put("mail.transport.protocol", "smtp");
        props.put("mail.smtp.auth", "true");
        props.put("mail.smtp.starttls.enable", "true");
        props.put("mail.debug", "true");

        return mailSender;
    }
}
```
### Step 5: Implement MailSenderService
```java
@Service
public class MailSenderService {
    @Autowired
    private JavaMailSender mailSender;

    public void sendNewMail(String to, String subject, String body) {
        SimpleMailMessage message = new SimpleMailMessage();
        message.setTo(to);
        message.setSubject(subject);
        message.setText(body);
        mailSender.send(message);
    }
}
```

### Step 6: Start sending email
```java
private final MailSenderService mailService;

public void Foo(){
 mailService.sendNewMail("test@gmail.com", "Subject right here", "Body right there!")
}
```

I hope this guide will help you. Thanks for reading!
Movie Code: The Best Cinematic Inspirations for Programmers
Tags: webdev, developer, movies, inspiration
Published: 2023-06-09 07:17:02

In the age of information, where technology and programming have become essential parts of our daily life, what better way to find inspiration than through the big screen? We present you a ranking of the best movies that every programmer, both novice and experienced, should watch to find inspiration and motivation.

**"The Social Network" (2010)**

Directed by David Fincher, this movie is an adaptation of the book "The Accidental Billionaires", which tells the story of how Mark Zuckerberg created Facebook while at Harvard. Although some aspects are dramatized for the cinema, "The Social Network" provides a fascinating insight into the life of a programmer and the process of creating a revolutionary tech product.
[Watch Trailer](https://movies.hebertdev.net/movies/the-social-network/37799)

**"WarGames" (1983)**

In "WarGames", a young hacker, played by Matthew Broderick, accidentally finds himself connected to a military supercomputer. While the technology in the movie may seem outdated today, the story remains relevant and raises important ethical questions about hacking and the responsibility that comes with programming knowledge.
[Watch Trailer](https://movies.hebertdev.net/en/movies/wargames/860)

**"The Imitation Game" (2014)**

This movie is a moving biography of Alan Turing, a British mathematician who is considered one of the fathers of modern computing. "The Imitation Game" offers a look at the history of programming and is an inspiration for anyone interested in this field.
[Watch Trailer](https://movies.hebertdev.net/en/movies/the-imitation-game/205596)


**"Her" (2013)**

In "Her", a lonely writer falls in love with an intelligent operating system, personified by Scarlett Johansson's voice. While the movie focuses more on artificial intelligence than on programming, it offers an intriguing reflection on the relationship between humans and technology.
[Watch Trailer](https://movies.hebertdev.net/en/movies/her/152601)

**"Ex Machina" (2014)**

In "Ex Machina", a young programmer is selected to participate in an innovative experiment in artificial intelligence, evaluating the capabilities and consciousness of an attractive female robot. This movie is not only an exciting thriller but also raises interesting questions about AI and ethics in programming.
[Watch Trailer](https://movies.hebertdev.net/en/movies/ex-machina/264660)

These movies not only provide entertainment but also offer a unique perspective on the challenges, dilemmas, and triumphs that programmers can face. Each of these movies can provide you with a new perspective or inspiration on your programming journey. So get your popcorn ready and enjoy!

[View this post in my website:](https://hebertdev.net/en/blog/desarrollo-web/codigo-de-pelicula-las-mejores-inspiraciones-cinematograficas-para-programadores)
How to add webwiki review button in blogger
Tags: webdev, webwiki, blogger, buttons
Published: 2023-06-09 07:09:18

In this post I will show you how to add webwiki review button on blogger step by steo. 
First of all you need to add your website or blog to the webwiki review platform.
Go to [webwiki.com](www.webwiki.com) and add your website or click to learn how to add website to [webwiki review platform here](https://www.freeguestposting.site/how-to-add-website-to-webwiki-review)
To add a webwiki review button follow these instructions. 
Go to webwiki and search your website. Remember you need to add your website first.
Scroll through your website review to near botom and click the "add review button on your website" or the similar phrase or sentence.
Copy the codes provided. Go to your blogger blog and add a new HTML/JavaScript gadget. Paste the codes and save. You can click [here](https://www.freeguestposting.site/how-to-add-webwiki-review-button-on-your-blog) to learn more.
You customers and visitors will now see the review button and review your website accordingly.
Debug or Refactor? The Coding Dilemma!
Tags: discuss
Published: 2023-06-09 07:00:00

Would you rather spend an entire day debugging a complex code issue or refractor an entire codebase from scratch. It's a tough call! Share your preference and the reasons behind your choice.

Follow the DEVteam for more discussions and online camaraderie!

{% embed [https://dev.to/devteam](https://dev.to/devteam) %}

[Image by pch.vector on Freepik](https://www.freepik.com/author/pch-vector)
How Can You Build a Strong Personal Brand in a Competitive Job Market?
Tags: discuss, codenewbie, beginners, career
Published: 2023-06-09 07:00:00

Building a standout personal brand as a developer or coder is essential in today's competitive job market. What strategies have you found effective in establishing and promoting your personal brand to showcase your expertise and attract opportunities?

Follow the [CodeNewbie Org](https://dev.to/codenewbieteam) and [#codenewbie](https://dev.to/t/codenewbie) for more awesome discussions and online camaraderie!

*{% embed* [https://dev.to/codenewbieteam](https://dev.to/codenewbieteam) *%}*
Harness the Power of Variable Fonts in React Native for Stunning Typography
Tags: reactnative, fonts, typography
Published: 2023-06-09 06:55:05

## Integrating Variable Fonts in React Native

To integrate variable fonts in your React Native project, follow these steps:

Step 1: Install the required packages
In your React Native project directory, run the following command to install the necessary packages:

```
expo install expo-font
```

Step 2: Import and load the variable font
In your component file, import the expo-font package:

javascript

```
import * as Font from 'expo-font';
```

Next, define a function to load the variable font:

javascript

```
async function loadFonts() {
  await Font.loadAsync({
    'VariableFontName': require('./path/to/variable-font.ttf'),
  });
}

// Call the function to load the fonts (usually in your App component or entry file)
loadFonts();
```

Make sure to replace 'VariableFontName' with the actual name of your variable font, and provide the correct path to the font file.

Step 3: Apply the variable font in your components
Once the variable font is loaded, you can use it in your React Native components:

javascript

```
import React from 'react';
import { Text } from 'react-native';

const MyComponent = () => {
  return (
    <Text style={{ fontFamily: 'VariableFontName' }}>
      This text uses the variable font!
    </Text>
  );
};
export default MyComponent;
```

Replace 'VariableFontName' with the name of the variable font you loaded in Step 2.

Resources and Further Learning
[Google Fonts](https://fonts.google.com/variablefonts) - Variable Fonts - Explore a wide range of variable fonts available from Google Fonts.
[Variable Fonts on MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide) - MDN Web Docs guide on variable fonts.
[expo-font Documentation](https://docs.expo.io/versions/latest/sdk/font/) - Official documentation for the expo-font package.
[Open Source Fonts](https://getfont.net/) - An open Source gallery for fonts.
By the end of this post, readers will have a comprehensive understanding of how to leverage variable fonts in React Native to create visually stunning
Fixing Prettier not working with VSCode
Tags: vscode, javascript, beginners, programming
Published: 2023-06-09 06:49:46

[Ukrainian version](https://devcenter.space/uk/posts/prettier-vscode-problems/)

## Problem Description

You have installed and enabled Prettier in your JS application, but Visual Studio Code does not format or highlight your code.

If you have not yet installed Prettier in your application - you can see the guide for its installation [at the link](https://devcenter.space/posts/prettier-setup/)

## Ways of Fixing:

There are several possible problems that can occur with code analysis. Here are the main ones:



### Prettier is Not Installed

Check your `package.json` for the Prettier version installed:


![Prettier in package.json](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/7qj3dskptbu9ev7x5c4j.png)



If prettier is installed, try running `npm install`, just in case.


### Prettier Extension in VSCode is Not Installed

Make sure you have installed the Prettier extension in VSCode. If it is missing, you can find it at the link: https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode



### Invalid or Missing Configuration File

Check that the `.prettierrc` or `prettier.config.js` file is present and correct.

Try replacing your configuration file with another, verified file. You can use the basic config from the documentation:

```JSON
{
  "trailingComma": "es5",
  "tabWidth": 4,
  "semi": false,
  "singleQuote": true
}
```



### Prettier is Not Set as a Default Code Formatter

Go to `File -> Preferences -> Settings` or (`Ctrl` + `comma`). And do a search on the word `formatter`.

In the opened tab, select 'Default Formatter' - `Prettier'.


![VSCode default formatter select](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/fnkotb8cg2i59zz1lsem.png)





### Disabled File Extensions or Incorrect Language Configurations

Prettier can be configured to disable parsing for certain file types - so check that the required files are not included in the `prettier-ignore` file.
Also, check that your file extension is spelled correctly.

Also, make sure that the settings correspond to the programming language you are using.



### Conflicting VSCode Extensions

Try disabling other VSCode extensions. Conflicting extensions can interfere with Prettier.



### Obsolete Prettier version

Newer versions of VSCode extensions may not support older versions of Prettier. If necessary, raise the Prettier version in `package.json`.


## Conclusion

In this article, we looked at possible problems with the integration of Prettier and VSCode. I hope that these tips will help you solve the problems you encountered.

## Using Prettier with ESLint? See also:

- [Difference between Plugins and ESLint Rules](https://devcenter.space/posts/eslint-rules-vs-plugins/)
- [Mastering ESLint Configurations: Best Practices](https://devcenter.space/posts/eslint-best-practices/)

[More interesting articles](https://devcenter.space/).
Localhost:5000 Access Denied on MacOS | How do you fix it?
Tags: webdev, tutorial, codenewbie, programming
Published: 2023-06-09 06:49:43

In order to fix above issue, you simply have to turn off Airplay Receiver inside your macBook's System Preference.

![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/2g0lcp9pyrhr5kg3rnyx.png)

It turns out that Airplay Receiver is using Port 5000 for whatever reason it has. I hope this will fix your current issue. 

Thanks!
Effortlessly Manage Complex Projects with Our Intuitive Gantt Chart Tool
Published: 2023-06-09 06:43:29

https://www.gantt-online.com/

Gantt Chart | Project Management Tool
Clear at a glance: personnel, tasks, schedule, work hours, cycle, dependencies
Easy management for projects of any size and complexity.

You can create a Gantt chart without logging in, and once you save it, a unique address will be generated. You can share this address with your team or remember it to continue editing next time without logging in.
Prepare for Success: Access Free AZ-900 Dumps
Published: 2023-06-09 06:41:30

This AZ- 900 test Labs Dumps test consists of 40 questions. It consists of multiple choice questions, fill- in- the-blank questions, and true/ false questions that you might anticipate to see on the factual <a href="https://examlabsdumps.com/microsoft-exam/az-900-dumps-free-4-indian-fresher/">AZ 900 Dumps Free</a>instrument test. Since this is a test Labs Dumps test that is designed to mimic the factual test, there will be no explanations handed for answer given. still, feedback WILL be handed to let you know if you've answered rightly or not. 
 The maximum score for this test Labs Dumps test is 1000. You must score at least 700 to pass. 
 test Labs Dumps is now offering sample questions for test Labs Dumps Azure Fundamentals AZ 900. Whether you're deciding which test to subscribe up for, or simply want to exercise the accoutrements necessary to complete instrument for this course, we've handed a practice test to better aid in instrument. 100 of the questions are real test questions; from a recent interpretation of the test Labs Dumps Azure Fundamentals AZ 900 test. 
Got Free Exams Updates Here >>>>> https://examlabsdumps.com/microsoft-exam/az-900-dumps-free-4-indian-fresher/
Git
Published: 2023-06-09 06:23:28

**git rebase vs git merge**

git rebase

it removes the existing commits which are ahead of the current node and it applies a new reference to the parent branch and fast forward the commits as a clean way




git merge

it simply merges from parent to child and child to parent without dereferencing



> If you only ever rebase commits that have never left your own computer, you’ll be just fine. If you rebase commits that have been pushed, but that no one else has based commits from, you’ll also be fine. If you rebase commits that have already been pushed publicly, and people may have based work on those commits, then you may be in for some frustrating trouble, and the scorn of your teammates.
新建了一个项目，出现了类似警告，怎么处理？
Published: 2023-06-09 06:08:07

今天空闲 用npx create-react-app xxx创建了一个demo.打开之后什么也没做，在谷歌浏览器控制台出现了类似警告，内容如下
![Image description](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/bn5qtb1vwts9upaj0btg.png)。该怎么处理呢？
What is Techology
Tags: technolog, ai
Published: 2023-06-09 04:43:04

Technology has become an integral part of our daily lives, and yet, defining it can be a complex and elusive task. From the invention of the wheel to the rise of artificial intelligence, technology has evolved in countless ways over the course of human history. But what exactly is technology, and how has it changed over time? In this article, we'll unpack the mystery of technology by exploring its definition, origins, and evolution. We'll delve into the various ways in which technology has transformed our world and examine the social, cultural, and economic implications of these changes. Whether you're a tech enthusiast or simply curious about the role of technology in society, this article will provide a thought-provoking and informative overview of this fascinating topic. So buckle up and get ready to explore the world of technology like never before! [**What is Technology**](https://www.regularupdates.tech/2023/06/what-is-technology.html)