Changes between Version 13 and Version 14 of MergerTips

Timestamp:

Jul 18, 2023, 10:27:51 AM (16 months ago)

Author:

Natalia Bidart

Comment:

--

MergerTips

@@ -27 +27 @@
 Put the contents below in `django-src/backport.sh`. Add `backport.sh` to `django-src/.git/info/exclude` to prevent the file from appearing in `git status`.
 
-After committing a change to main. Switch to the branch you wish to backport to and execute `./backport <full hash of commit to backport>`. You can double check the commit message looks ok, then `git push`.
+After committing a change to main. Switch to the branch you wish to backport to and execute `./backport <full hash of commit to backport>`. If there are no conflicts, you can double check the commit message looks ok, then `git push`.
+
+If there is any conflict, make sure to properly fix it, then run `git add` on the conflicted files, and continue with the cherry pick with `git cherry-pick --continue`. Please note that in this case, you will have to manually amend the commit so it has the proper **branch name prefix** (e.g. `[4.2.x]`). Review your changes, and only then push them upstream.
+
 {{{
 #!/bin/bash