File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -134,6 +134,7 @@ pip install --user bitbucket-cli
134
134
## GitHub Badges
135
135
136
136
https://github.com/commonality/architecture-decision-records/wiki/GitHub-repository-status-badges
137
+
137
138
## The Evils of Rebasing
138
139
139
140
Some people like rebasing to make their ` git log --graph ` look like a straight line,
@@ -145,7 +146,7 @@ Git lets you get away with this because Git is ultra powerful, but...
145
146
146
147
#### Cautionary Tale from Experience
147
148
148
- I was called over to a desk by my colleague in Denmark who had a little Git problem.
149
+ While consulting in Denmark, I was called over to a desk by my colleague who had a little Git problem.
149
150
150
151
He's tried to do a "git rebase" but was hitting merge conflict after merge conflict and didn't know how to get out of it.
151
152
You can’t perform that action at this time.
0 commit comments