SaitTalhaNisanci 4a9d516f1b Add a job to check if merge to enterprise master would fail (#3777) ... * add a job to check if merge to enterprise master would fail Add a job to check if merge to enterprise master would fail. The job does the following: - It checks if there is already a branch with the same name on enterprise, if so it tries to merge it to enterprise master, if the merge fails the job fails. - If the branch doesn't exist on the enterprise, it tries to merge the current branch to enterprise master, it fails if there is any conflict while merging. The motivation is that if a branch on community would create a conflict on enterprise-master, until we create a PR on enterprise that would solve this conflict, we won't be able to merge the PR on community. This way we won't have many conflicts when merging to enterprise master and the author, who has the most context will be responsible for resolving the conflict when he has the most context, not after 1 month. * Improve test suite to be able to easily run locally * Add documentation on how to resolve conflicts to enterprise master * Improve enterprise merge script * Improve merge conflict job README * Improve merge conflict job README * Improve merge conflict job README * Improve merge conflict job README Co-authored-by: Nils Dijk <nils@citusdata.com>		2020-05-04 17:08:17 +03:00
..
config.yml	Add a job to check if merge to enterprise master would fail (#3777)	2020-05-04 17:08:17 +03:00