It can work both ways, but it helps to say which branch to merge to. Also for each change make a branch off of the 2.8.x or master. In other words don’t build pull requests that depend on other pull requests.
Saying that. I am going to look at these requests this morning and see what I can do with them. I will log on to IRC as well.
Jesse
From: ianwallen <ianwallen@anonymised.com>
Sent: March 21, 2013 4:09 PM
To: geonetwork-devel@anonymised.comeforge.net
Subject: Re: [GeoNetwork-devel] Pending patches in trac
Landry,
I noticed you have sent a lot of pull request. That’s good.
I do want to give you a quick pointer based on my experience when dealing
with branches as I noticed that afew of your tickets are targeting the 2.8.x
branch.
When submitting a pull request which needs to be applied to the master and
another branch, I generally try to perform a test cherry-pick of that commit
between branches - if it can get cherry picked without any issues then I
generally ask that the change be cherry picked to the other branch in my
pull request. If there are conflicts or issues during the cherry-pick, I
then submit a separate pull request for the branch and indicate this in the
comments of the pull request. This way, members like Jesse are not wasting
time trying to merge changes between branches.
Also, I have noticed that generally if I don’t ask for it to be cherry
picked to another branch it does not get done. Especially if I send a change
to the Master.
Also, I believe they prefer (Jesse - correct me if I’m wrong) that the
change be submitted to the lower branch (i.e. 2.8) and then cherry picked to
the master. But it can work both ways…
–
View this message in context: http://osgeo-org.1560.n6.nabble.com/Pending-patches-in-trac-tp5037886p5042136.html
Sent from the GeoNetwork developer mailing list archive at Nabble.com.
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork