Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jul 14, 2023. It is now read-only.

Commit ecd49fb

Browse files
Xiulung Choygitbook-bot
authored andcommitted
GitBook: [#190] No subject
1 parent cde5a3e commit ecd49fb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

guides/graphite-cli/restacking-branches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A key benefit of using Graphite as opposed to vanilla Git when working with stacks is dependency management for your branches, i.e. keeping track of the "parent" of a given branch. When a parent branch changes in some way or is deleted, vanilla Git, because it does not have this concept of branch dependencies, leaves the parent as is.
44

5-
The Graphite CLI introduces "restacking", which is the process of ensuring that the history of a branch is updated when its parent changes. Consider where we left off on the [previous page](https://docs.graphite.dev/guides/graphite-cli/syncing-and-resolving-conflicts) after running `gt repo sync`. Although `part_2` is now dependent on main, we haven't yet restacked it, and we can see that by viewing the Git history with `gt log long`:
5+
The Graphite CLI introduces "restacking", which is the process of ensuring that the history of a branch is updated when its parent changes. Consider where we left off on the previous page. Although `part_2` is now dependent on main, we haven't yet restacked it, and we can see that by viewing the Git history with `gt log long`:
66

77
![log long output](<../../.gitbook/assets/image (16).png>)
88

guides/graphite-cli/syncing-and-resolving-conflicts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Syncing with remote
1+
# Syncing with remote repository
22

33
{% hint style="info" %}
4-
Very often as you're building, the remote trunk branch will move ahead of your local repository, and you'll want to pull in the latest changes and resolve any conflicts before you land your pull requests.
4+
Often, as you're building, the remote trunk branch will move ahead of your local repository, and you'll want to pull in the latest changes and resolve any conflicts before you land your pull requests.
55
{% endhint %}
66

77
## Syncing your repo
@@ -22,4 +22,4 @@ Now, if we run `gt log`, we see that `part_2` is based on `main`:
2222

2323
<img src="../../.gitbook/assets/image (6).png" alt="" data-size="original">
2424

25-
Since we didn't restack as part of the `sync` command here (we could have done so with `--restack`), we see that `part_2` needs a restack onto `main`. We'll talk about what that means in the next section.
25+
Since we didn't restack as part of the `sync` command here (we could have done so with `--restack`), we see that `part_2` needs a restack onto `main`. We'll talk about what that means in the next section: [restacking branches](https://docs.graphite.dev/guides/graphite-cli/restacking-branches).

0 commit comments

Comments
 (0)