[QGIS-Developer] changes in QGIS development with git

[William Kyngesburye]

It's been a couple years since I made a commit with git, and I find that I can't do that any more.  It appears master (and branches?) are locked so that only travis-ci-validated commits can be pushed.  That means I have to use a github fork and make pull requests, yay.  I just want to make sure I have this correct now.

I figured out how to reset my 8 year old fork to current master.

The PR process from my years-old notes:

1. merge upstream changes to my fork

2. make my changes

3. push my changes to my fork

4. make PR to qgis upstream

5. (new) wait for travis-ci to succeed

6. merge PR

One thing I'm not sure about is backporting.  I've seen [Backport] tagged messages from Github.  And I recall talk about problems with the automated backporting bot/app (fixed?).

How do I handle backporting?  Most of the changes I need to make need to be backported.


-----
William Kyngesburye <kyngchaos*at*kyngchaos*dot*com>
http://www.kyngchaos.com/

"Mon Dieu! but they are all alike.  Cheating, murdering, lying, fighting, and all for things that the beasts of the jungle would not deign to possess - money to purchase the effeminate pleasures of weaklings.  And yet withal bound down by silly customs that make them slaves to their unhappy lot while firm in the belief that they be the lords of creation enjoying the only real pleasures of existence....

- the wisdom of Tarzan