You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
<b><ins>Incorporate your feature branch changes into development</ins></b> <br/>
38
41
1.) ```git pull development```<br/>
39
42
2.) ```git branch feature-branch```<br/>
@@ -57,13 +60,13 @@
57
60
14 - 16 can also be done via GitHub via Pull request to review changes before the merge
58
61
59
62
<b><ins>You have uncommitted changes in a local branch and want to switch to another branch without passing over those changes</ins></b> <br>
60
-
Step 1: You are on `branch-A` with uncommitted changes
61
-
```git stash``` # Save changes and clean the working directory
62
-
```git checkout branch-B``` # Switch to another branch (e.g., branch-B)
63
+
Step 1: You are on `branch-A` with uncommitted changes<br>
64
+
```git stash``` # Save changes and clean the working directory<br>
65
+
```git checkout branch-B``` # Switch to another branch (e.g., branch-B)<br>
63
66
64
-
Step 2: Work on `branch-B` and then return to `branch-A`
65
-
```git checkout branch-A``` # Switch back to the original branch
66
-
```git stash apply``` # Restore the stashed changes on `branch-A`
67
+
Step 2: Work on `branch-B` and then return to `branch-A` <br>
68
+
```git checkout branch-A``` # Switch back to the original branch<br>
69
+
```git stash apply``` # Restore the stashed changes on `branch-A`<br>
67
70
68
71
69
72
<b><ins>How to Abort the rebase and restore the branch to its original state.</ins></b> <br>
@@ -76,7 +79,7 @@ Step 2: Work on `branch-B` and then return to `branch-A`
76
79
1.) `git fetch origin` - Updates your local information about the remote branches without changing your working branch <br>
77
80
2.) `git reset --hard origin/your-branch-name` - `Forces your local branch to match the remote branch exactly, discarding any local changes or commits that differ from the remote branch`
78
81
79
-
<b><ins>Troubleshooting Git</ins></b><br/>
82
+
## Troubleshooting Git</ins></b><br>
80
83
81
84
<b>Issue #1</b><br>
82
85
After performing <b>git pull</b> you get this error:
@@ -86,7 +89,11 @@ After performing <b>git pull</b> you get this error:
86
89
87
90
<b>Issue #2</b><br/>
88
91
After performing a ```git push -f``` or ```git push -u origin your-feature-branch``` you get this:<br>
89
-
```the upstream branch of your current branch does not match the name of your current branch```<br><br>
92
+
93
+
```
94
+
the upstream branch of your current branch does not match the name of your current branch
95
+
```
96
+
90
97
<b>Solution:</b> <br>
91
98
Your local and remote branch have different names<br><br>
0 commit comments