2,186
edits
Changes
→git2cl: !! should read more
You can then fill out the PR form. You might have to select the Gramps 'base' branch you are basing on if it is different than 'master', this will be evident if you see "Can’t automatically merge". Add any comments you have on your work. And push the 'Create Pull Request' button.
====Send your contribution without rights to push====
You can [https://help.github.com/articles/fork-a-repo/ fork] the Gramps repository and create a [https://help.github.com/articles/using-pull-requests/ pull request]. Otherwise check it into Git if you obtained the [[#Obtaining_a_copy_of_the_Gramps_repository|permission to do push]].
Since syncing a fork can create unwanted commits, you may need to [https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request rebase] your pull request first. Remember to replace edx and master with the actual names of the remote repository (upstream) and the branch you're working on.
* [[Brief_introduction_to_Git#Making_a_Pull_Request_.28PR.29_on_Github|Making a Pull Request (PR) on Github]]
== Working with development branches ==
* logs are important -- please give some thought to the log message. All developers should read the [[Committing policies]].
=== Browse Git ===
An alternative to the command line tools to view the Git repository is the [https://github.com/gramps-project/gramps online interface].
== Multiple Working Folders ==
{{man note|Multiple Working Folders|This type of setup is uncommon.}}
Using a single working folder as described above entails context switching when developing across multiple branches. For example:
* develop and test changes on the gramps41 branch,
WARNING. Using the builtin 'git worktree' may not be supported by Eclipse (as at Dec 2017), see [https://bugs.eclipse.org/bugs/show_bug.cgi?id=477475 Bug 477475 - git 2.5 worktree support].
== git2cl ==
The Gramps project does not keep a ChangeLog file under source control. All change history is captured by git automatically when it is committed. A ChangeLog file is generated from the git commit logs before each release using [[Brief_introduction_to_SVN#How_to_use_git2cl|git2cl]]. Developers should take care to make useful commit log messages when committing changes to git. Please read the [[Committing policies]] for details.
