[
https://issues.apache.org/jira/browse/LUCENE-6985?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dawid Weiss updated LUCENE-6985:
--------------------------------
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|https://github.com/dweiss/lucene-git-guides/blob/master/01-setup.sh].
2. [basic git
concepts|https://github.com/dweiss/lucene-git-guides/blob/master/02-core-concepts.sh]:
branches, remote branches, references, staging area.
Simple tasks:
1. [Checkout branch X, create local branch Y, modify something, create a diff
for
Jira.|https://github.com/dweiss/lucene-git-guides/blob/master/03-clone-and-prepare-a-patch.sh]
2. [Apply simple patches on (remote-tracking) branch X, without creating any
intermediate
branches.|https://github.com/dweiss/lucene-git-guides/blob/master/04-working-directly-on-a-remote-tracking-branch.sh]
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|https://github.com/dweiss/lucene-git-guides/blob/master/10-locate-historical-svn-commit-or-branch.sh]
was:
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|https://github.com/dweiss/lucene-git-guides/blob/master/01-setup.sh].
2. [basic git
concepts|https://github.com/dweiss/lucene-git-guides/blob/master/02-core-concepts.sh]:
branches, remote branches, references, staging area.
Simple tasks:
1. [Checkout branch X, create local branch Y, modify something, create a diff
for
Jira.|https://github.com/dweiss/lucene-git-guides/blob/master/03-clone-and-prepare-a-patch.sh]
2. [Apply simple patches on (remote-tracking) branch X, without creating any
intermediate
branches.|https://github.com/dweiss/lucene-git-guides/blob/master/04-working-directly-on-a-remote-tracking-branch.sh]
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|https://github.com/dweiss/lucene-git-guides/blob/master/10-locate-historical-svn-commit-or-branch.sh]
> Create some (simple) guides on how to use git to perform common dev tasks
> -------------------------------------------------------------------------
>
> Key: LUCENE-6985
> URL: https://issues.apache.org/jira/browse/LUCENE-6985
> Project: Lucene - Core
> Issue Type: Task
> Reporter: Dawid Weiss
> Assignee: Dawid Weiss
>
> 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|https://github.com/dweiss/lucene-git-guides/blob/master/01-setup.sh].
> 2. [basic git
> concepts|https://github.com/dweiss/lucene-git-guides/blob/master/02-core-concepts.sh]:
> branches, remote branches, references, staging area.
> Simple tasks:
> 1. [Checkout branch X, create local branch Y, modify something, create a diff
> for
> Jira.|https://github.com/dweiss/lucene-git-guides/blob/master/03-clone-and-prepare-a-patch.sh]
> 2. [Apply simple patches on (remote-tracking) branch X, without creating any
> intermediate
> branches.|https://github.com/dweiss/lucene-git-guides/blob/master/04-working-directly-on-a-remote-tracking-branch.sh]
> 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|https://github.com/dweiss/lucene-git-guides/blob/master/10-locate-historical-svn-commit-or-branch.sh]
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
