Thanks, Hazen:

Good stuff.

Here are some questions concerning git capabilities and
our current workflow that you have documented in README.developers.

Do you think it would be a good idea to change all the "git merge"
commands in your workflow documentation to use the --ff-only option?
That is use

git merge --ff-only origin/master

early in your workflow documentation and

git merge --ff-only new_branch

later in that documentation?

And if you like that idea, is there a better way to implement ff-only
(say with a git config option that applies just to our repo)?

The rest of this is just my observations about how the basic
collaborative model between our separate recent contributions is
working with git since that aspect of git is completely new to me.

The "git fetch" command has been silent for me up to now
(since I was the only person pushing until now).  So I was
turning myself inside out to make sure that really meant
no work had been pushed by others.  But now I have a real
case of external work (thanks to your recent push) I get the
following results:

git fetch
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
>From ssh://git.code.sf.net/p/plplot/plplot
fc33fae..29271dd  master     -> origin/master

So that command is clearly not silent when there is
something to report.  Furthermore,

"git status" gives the following extremely useful information
after that fetch.

# On branch master
# Your branch is behind 'origin/master' by 1 commit, and can be
fast-forwarded.
#
nothing to commit (working directory clean)

So I ran

git merge --ff-only origin/master

and all was well (as expected from the status results).

I am really glad there are now two of us making pushes to our official
git repo, and I hope there will soon be a lot larger fraction of our
core developers doing this so we all learn together at the present
time how to collaborate well with each other using our adopted git
workflow.

Alan
__________________________
Alan W. Irwin

Astronomical research affiliation with Department of Physics and Astronomy,
University of Victoria (astrowww.phys.uvic.ca).

Programming affiliations with the FreeEOS equation-of-state
implementation for stellar interiors (freeeos.sf.net); the Time
Ephemerides project (timeephem.sf.net); PLplot scientific plotting
software package (plplot.sf.net); the libLASi project
(unifont.org/lasi); the Loads of Linux Links project (loll.sf.net);
and the Linux Brochure Project (lbproject.sf.net).
__________________________

Linux-powered Science
__________________________

------------------------------------------------------------------------------
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Plplot-devel mailing list
Plplot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/plplot-devel

Reply via email to