thisisashukla / pgrouting

Repository contains pgRouting library. Development branch is "develop", stable branch is "master"
http://www.pgrouting.org
GNU General Public License v2.0
0 stars 0 forks source link

Meeting June 13: No Circular Merges #31

Open thisisashukla opened 7 years ago

thisisashukla commented 7 years ago

About Circular Merge

A is a person and works on a_branch in A repo.

Lets consider this scenario.

A makes a pull request to the main branch from its a_branch. The above pull request gets merged. A fetches upstream. A merges upstream/a_branch into his origin/a_branch. The above scenario is an example of circular merge. This kind of merge makes no sense. So, we should not do circular merges.

Instead, we should follow the below practice.

A makes a pull request to the main branch from its a_branch. The above pull request gets merged. B fetches upstream. B merges upstream/a_branch into his origin/a_branch.