🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) webknjaz

Example: Moving up to a few commits to another branch

Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.

cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated

git checkout branch-B
git cherry-pick X
git cherry-pick Y

Things to remember when compiling/linking C/C++ software

by Angel Leon. March 17, 2015;

Last update on December 14, 2023

Updated on February 27, 2023

Updated August 29, 2019.

FAQ по Gitter-чатам группы Dev-UA

Так получилось, что мы открываем сейчас достаточно много чатов в [Gitter.im][1]: часто это совсем новые для нас сообщества (как [PHP-чат][2], например), а часто - это уже существующие чаты, которые мы создали и администрировали в Skype (например, [Frontend-UA][3]). Не зависимо от того, новый ли это чат или "переезжающий", нам раз за разом задают одни и те же вопросы. Здесь мы собрали их и подготовили несколько ответов.

Почему Gitter?

Больше 300 человек в чате (это лимит в Skype)

# emerge -pvq sssd openldap sudo openssh
[ebuild   R   ] net-nds/openldap-2.4.38-r2  USE="berkdb crypt gnutls ipv6 minimal sasl ssl syslog tcpd -cxx -debug -experimental -icu -iodbc -kerberos -odbc -overlays -perl -samba (-selinux) -slp -smbkrb5passwd" ABI_X86="(64) -32 (-x32)" 
[ebuild   R   ] net-misc/openssh-6.7_p1  USE="hpn pam pie -X -X509 -bindist -kerberos -ldap -ldns -libedit -sctp (-selinux) -skey -static" 
[ebuild   R   ] sys-auth/sssd-1.12.1  USE="ssh sudo -acl -augeas -autofs -locator -manpages -netlink -nfsv4 -nls -python (-selinux) {-test}" PYTHON_TARGETS="python2_7" 
[ebuild   R   ] app-admin/sudo-1.8.12  USE="ldap nls pam sendmail -offensive (-selinux) -skey"

# < /etc/sssd/sssd.conf

# Prerequisites: netcat-openbsd (BSD version of netcat)
$ ssh -fND 127.0.0.1:8081 user@<your-vps>
$ git config --global url."https://github".insteadOf git://github
$ git config --global http.proxy 'socks5://127.0.0.1:8081'
$ echo -e 'Host github.com\nProxyCommand nc -x 127.0.0.1:8081 %h %p' >> ~/.ssh/config

Alternative solutions:

https://cms-sw.github.io/tutorial-proxy.html (more verbose tutorial)

Gerrit vs Github: for code review and codebase management

Sure, Github wins on the UI. Hands down. But, despite my initial annoyance with Gerrit when I first started using it almost a year ago, I am now a convert. Fully. Let me tell you why.

Note: This is an opinionated (on purpose) piece. I assume your preferences are like mine on certain ideas, such as:

Fast-forward submits to the target branch are better than allowing merge commits to the target branch. The reason I personally prefer this is that, even if a non-conflicting merge to the target branch is possible, the fact that the review/pull request is not up to date with the latest on the target branch means feature branch test suite runs in the CI pipeline reporting on the review/PR may not be accurate. Another minor point is that forced merge commits are annoying as fuck (opinion) and clutter up Git log histories unnecessarily and I prefer clean histories.
Atomic/related changes all in one commit is something worth striving for. Having your dev

	# -- coding: utf-8 --

	import base64

	from items import EmailItem, EmailLabelItem
	from loader import JSONItemLoader
	from oauth2spider import OAuth2Spider

	class GmailSpider(OAuth2Spider):
	name = "gmail"

	# author: tmwhere.com

	# --- third party dependencies
	PIXI = require('pixi.dev')
	_ = require('lodash')

	noise = require('perlin').noise
	Quadtree = require('quadtree').Quadtree
	seedrandom = require('seedrandom')
	# ---

	test:
	override:
	- find . -maxdepth 1 -type d -not -name . > test_dirs:
	parallel: true
	- python circle_node_to_dirs.py < test_dirs > test_dirs_for_node:
	parallel: true
	- echo "Testing `cat test_dirs_for_node`":
	parallel: true
	- py.test `cat test_dirs_for_node`:
	parallel: true

	-- add this to your rc.lua, or include it as a dependency

	-- Don't forget to add this to the layout section:
	-- right_layout:add(vpnwidget)




	vpnwidget = wibox.widget.textbox()
	vpnwidget:set_text(" VPN: N/A ")