|
You are here |
andreabergia.com | ||
| | | | |
www.integralist.co.uk
|
|
| | | | | Introduction Rebase before merge Example (Bonus) Modifying content within an interactive rebase Introduction This is a quick post to cover a GitHub workflow that is utilised by our specific team (Frameworks) here at BBC News. The basis of our workflow is this: Open a GitHub PR (Pull Request) by creating a new feature branch from master Make feature specific changes and request a code review If given a "thumbs up", this means the PR author is allowed to handle merging the PR The merge process requires a s... | |
| | | | |
www.simpleprimate.com
|
|
| | | | | The other day I found myself having serious trouble publishing a new post to my blog. I was able to solve the problem through the use of Git rebase and I thought I would share my experience in case somebody else happens to go through the same thing. | |
| | | | |
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: | |
| | | | |
andreabergia.com
|
|
| | | Git has an excellent tool designed to help you reorder the commit history: interactive rebase. This can be excellent if you want to keep the history clean, so that it helps other programmers understand the logic behind the changes rather than the actual sequence of commits. Let's walk through an example. Let's write some history Link to heading Let's start by creating an empty project in a new directory: | ||