Hi
As previously discussed, we decided to accept pull requests from
Github to invite more contributions. However, please remember that
anything written directly to the github repository will not be
mirrored into the git.lxde.org repositories (I will see if there is a
way to remove all write access to github repositories from everyone
except Helix).
This means that you should *never hit the "Merge" button on a PR*!
Otherwise the PR will be lost on the next push to the repo.
Here is a helpful alias to easily merge PRs onto your current branch.
Add it to ~/.config/git/config (or ~/.gitconfig on older git clients)
in the [alias] section:
merge-pr = "!f() { git fetch $1 $2; git merge --ff-only FETCH_HEAD; }; f"
You give it a remote and a branch to merge and it will fetch and merge
it onto the current branch like so: https://mediacru.sh/PRyqFtbF6EWp
You can get the remote url and branch by clicking "Merge from the
command line" on github.
Note that to keep a clean history, we force fast-forward only.
J. Leclanche
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos. Get
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Lxde-list mailing list
Lxde-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxde-list
