[LUCENE-6985] Create some (simple) guides on how to use git to perform common dev tasks

• Type: Task
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Lucene Fields: New
• Assignee: Dawid Weiss
• Reporter: Dawid Weiss
• Created: 20/Jan/16 12:51
• Updated: 28/Aug/22 14:48
• Resolved: 03/Feb/16 17:19

Description

Some simple guides that demonstrate basic git principles and routine tasks (below). The guides are here:

https://github.com/dweiss/lucene-git-guides

Core concepts

1. how to clone and setup lucene/solr git repo for local work.
2. basic git concepts: branches, remote branches, references, staging area.

Simple tasks:

1. Checkout branch X, create local branch Y, modify something, create a diff for Jira.
2. Apply simple patches on (remote-tracking) branch X, without creating any intermediate branches. This also explains how to resolve conflicts, how to rebase, how to merge and what a fast-forward is.

More advanced:

1. Create a feature branch off branch X, develop the feature, then apply it back to X (as a single patch or a history of intermediate commits).
2. Create a feature branch off branch X, develop the feature, then apply it as a series of commits to X and Y (different branch).
3. Locate a historical SVN revision or tag/branch

Issue Links

• is related to: LUCENE-6937 Migrate Lucene project from SVN to Git.