Closed amakhaba closed 4 years ago
@amakhaba please update branch by merging master
into it and fixing up the conflicts.
Please also change the target branch from user/amakhaba/MT-738/Auto-code-format
to master
as branch user/amakhaba/MT-738/Auto-code-format
is already in master
and doesn't exists anymore.
See: How to modify a pull request on GitHub to change target branch to merge into?
I'm afraid this PR is a bit of mess now - it shows all the changes from earlier PRs as well, including the black autoformatting. Also a heap of conflicts. Any ideas?
I'm afraid this PR is a bit of mess now - it shows all the changes from earlier PRs as well, including the black autoformatting. Also a heap of conflicts. Any ideas?
Seems like there are 2 options (IMHO):
But @amakhaba and @tockards can decide.
Option 3: Make a new branch from master and just copy the files from this branch to that one. Make that a new commit.
Loses the commit history, but clean result and much easier.
@ajoubertza and @mmphego option 3 sounds like a better one. Can i finish up with the merge conflicts that i am addressing now and then we can plot a way forward
This PR does the following (Apply Futurize stage 2):
Jenkinsfile
.setup.py
.Definition of Done Checklist
JIRA: MT-738