Hi to all,
i would fix my ideas about branches on synfig and its git workflow
the branches are:
[kinder@localhost synfig]$ git branch -r origin/0.64.2 origin/0.64.x origin/1.0.x origin/HEAD -> origin/master origin/dev-1.0.1 origin/eldruin_new_cairo_core origin/eldruin_transformation_matrix origin/genete_cairo_core origin/genete_new_cairo_core origin/master
- master is the stable branch
- eldruin_new_cairo_core/eldruin_transformation_matrix/genete_cairo_core/genete_new_cairo_core are username_feature branches where new features are coded and then merged to master
- 0.64.2/0.64.x/1.0.x are the branches of the old releases
So what is origin/dev-1.0.1 branch?
To contribute i should:
- fork synfig on github
- clone my forked repo (origin for convention) in my local machine
- add original synfig repo (upstream for convention) with git remote add upstream …
At this point i have (in my local machine) all ten upstream branches, all ten origin branches and one master local branch.
So i starts coding in local master and when i have finished:
- git add
- git commit
My local master is now updated.
To synch local with upstream i should
- git fetch upstream (update all branches in upstream)
- git checkout master
- git merge upstream/master | git rebase upstream/master
So my local master should be synchronized with original synfig repo (upstream).
Now i can update my forked repo on github (origin)
- git push origin master
- make a pull request on github
Now my new features are in local master and origin master, if i want to add them for example in old releases like origin/0.64.2 i should:
- git fetch upstream
- git checkout -b 0.64.2 upstream/0.64.2 (create my local copy of original 0.64.2)
- readd my new feature in local 0.64.2 (git add; git commit)
- git push origin/0.64.2
Is correct this workflow ?