/explore

Click through on any links that interest you or select the planets on the right to continue exploring the Outer Web.
You are here

Explore from this page
8yd.no
Git squash and rebase | H.W. Sanden
| | blog.tracefunc.com
Git Rebase by Example - set_trace_func

Just a random coder writing about technology, web development, and various other geeky topics.
1.8 parsecs

Travel
| |
| | mislav.net
Git merge vs. rebase

How to settle on whether to merge or rebase at specific points in a team-shared git workflow.
2.5 parsecs

Travel
| |
| | felixrieseberg.com
Avoid Git Merge Conflicts During a Big Rebase

You need to rebase a feature branch you worked on weeks ago. Merge conflicts everywhere. But: There's hope. Use "git merge --squash".
2.7 parsecs

Travel
| |
| | citizen428.net
10 Common Git Problems and How to Fix Them - citizen428.net

I originally wrote this article for Codementor in October 2014. It should have something for everyone, from fairly new git users to experienced developers. 1. Discard local file modifications Sometimes the best way to get a feel for a problem is diving in and playing around with the code. Unfortunately, the changes made in the process sometimes turn out to be less than optimal, in which case reverting the file to its original state can be the fastest and easiest solution:
7.9 parsecs

Travel
|