🖥 Git: Merging vs Rebasing
In git, when there are some changes in a parent branch from which you forked, there are two strategies to incorporate them into your working branch:
✨ Merging:
As the name suggests, 'merges' the parent branch into your branch. The advantage is that handling conflicts (if any) is easier, since you only need to resolve them for the merge commit once. However, this may make the git history a bit harder to follow
✨ Rebasing:
Takes all the commits you made in your branch, and applies them on top of the head of the parent branch. As if repositioning the base of the branch.
This helps to create a linear and easy to follow git history, but conflict resolution may be tedious and you need to force push the branch to the origin.
In git, when there are some changes in a parent branch from which you forked, there are two strategies to incorporate them into your working branch:
✨ Merging:
As the name suggests, 'merges' the parent branch into your branch. The advantage is that handling conflicts (if any) is easier, since you only need to resolve them for the merge commit once. However, this may make the git history a bit harder to follow
✨ Rebasing:
Takes all the commits you made in your branch, and applies them on top of the head of the parent branch. As if repositioning the base of the branch.
This helps to create a linear and easy to follow git history, but conflict resolution may be tedious and you need to force push the branch to the origin.
👍6❤3
CHALLENGE
🔴 What will be the output?? Comment below 👇
const func = () => arguments.length;
console.log(func(1, 2, 3));
🔴 What will be the output?? Comment below 👇
👎4👍2🔥1
CHALLENGE
🔴What will be output??
const obj1 = { a: 1, b: { c: 2 } };
const obj2 = { ...obj1 };
obj1.b.c = 3;
console.log(obj2.b.c);
🔴What will be output??
❤7👍7
CHALLENGE
🔴 What will be the output??
class Parent {
static greet() {
return 'Hello from Parent';
}
}
class Child extends Parent {
static greet() {
return super.greet() + ' and Child';
}
}
const childInstance = new Child();
console.log(childInstance.greet);
🔴 What will be the output??
👍17👎5❤2
es-toolkit - a modern JavaScript utility library that's 2-3 times faster and up to 97% smaller, a major upgrade to lodash
#estoolkit #library #package
Read more 👉 https://github.com/toss/es-toolkit
#estoolkit #library #package
Read more 👉 https://github.com/toss/es-toolkit
👍10🔥1
Anyone can access deleted and private repository data on GitHub.
#article #security #git
https://thedevs.link/9Ulvqm
#article #security #git
https://thedevs.link/9Ulvqm
❤4😁3👍2
🍄Next month, we will offer a variety of Udemy courses. What specific courses are you interested in? Please let us know.
❤13👍4🔥1
CHALLENGE ❓
const array = [1, 2, 3];
const result = array.map(function(n) {
return this ? n : 0;
}, false);
console.log(result);
❤3🔥2👍1