Last active
August 6, 2021 09:55
-
-
Save sritasngh/c8f683a7827b1d81d39c1bc262ea15e6 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 1. create a new branch | |
| 2.a. if files are modified+new files: | |
| need two commits scancode+copyright - soft reset | |
| stash your changes - copyright is in stash + modified | |
| 2.b. Only new files are there: drop testing commits + sqash all other | |
| 3. rebase with upstream/master | |
| apply stash | |
| solve conflicts | |
| unstage changes | |
| 4. add new commits | |
| 5. push |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment