Commit bcaa2cf
committed
Sync project branch improvements
The repository appears to be initially created as a shallow clone.
We need both branches in order to merge between two branches. Fetch the
remote repository with the unshallow option. If that command fails,
then fetch the remote repository without the unshallow option. The hope
is that one of the two fetch commands will succeed.
Configure the user email address and user name in the repository so
that the merge does not fail with the message that user name and user
email are not configured. The email address is fake, since no email is
accepted at the jenkins.io site.
Perform the merge with the `--no-edit` command so that merge knows it
should not open an editor. May be unnecessary, but should not be harmful.1 parent a0aadc2 commit bcaa2cf
1 file changed
+4
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
| |||
0 commit comments