Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Possible issue with git merge (not up to date local changes) #23

Closed
kilianpaquier opened this issue Oct 24, 2024 · 4 comments · Fixed by #27
Closed

Possible issue with git merge (not up to date local changes) #23

kilianpaquier opened this issue Oct 24, 2024 · 4 comments · Fixed by #27
Assignees
@kilianpaquier
Labels
bug Something isn't working javascript Pull requests that update Javascript code released on @next Issue or pull request released next channel released Issue or pull request released main channel

Comments

@kilianpaquier
Copy link
Owner

There could be an issue where local changes fetch'ed during backmerge process aren't up to date with the remote ones.

Yeah this error means that git wasn't able to merge your branch, either because there're conflicts or because your target backmerged branch as newer commits. If it opens the pull request it's fine ^^

Is it really fine? Because with both my patched version and v1.1.5 are failing to backmerge a simple change and reverts to a PR instead (which merges just fine).
I really hope we haven't stumbled upon a new problem here 😅

Originally posted by @syphernl in #17 (comment)
@kilianpaquier kilianpaquier self-assigned this Oct 24, 2024
@syphernl syphernl mentioned this issue Oct 24, 2024
Merged
@kilianpaquier kilianpaquier linked a pull request Oct 24, 2024 that will close this issue
fix(execa): use await execa instead of execaSync since it produces unexpected errors when spawning git commands - fixes #17 #25
Merged
@kilianpaquier kilianpaquier removed a link to a pull request Oct 24, 2024
fix(execa): use await execa instead of execaSync since it produces unexpected errors when spawning git commands - fixes #17 #25
Merged
@kilianpaquier kilianpaquier added bug Something isn't working javascript Pull requests that update Javascript code labels Oct 24, 2024
@kilianpaquier
Copy link
Owner Author

Could be an issue with checkout, detaching local branch targeted by backmerge.

Investigating 💻

@kilianpaquier
Copy link
Owner Author

Issue comes from checkout where with -B it doesn't currently reset to the remote state of the checkout'ed branch but to the remote state of HEAD.

Fixing.

kilianpaquier added a commit that referenced this issue Oct 26, 2024
@kilianpaquier
fix(backmerge): checkout backmerged branches with commit hash to avoi…
a5715da 
…d `Updates were rejected because the tip of your current branch is behind` git error on push - fixes #23

Signed-off-by: kilianpaquier <kilian@kilianpaquier.com>
kilianpaquier added a commit that referenced this issue Oct 26, 2024
@kilianpaquier
fix(backmerge): checkout backmerged branches with commit hash to avoi…
7348de0 
…d `Updates were rejected because the tip of your current branch is behind` git error on push - fixes #23

Signed-off-by: kilianpaquier <kilian@kilianpaquier.com>
kilianpaquier added a commit that referenced this issue Oct 26, 2024
@kilianpaquier
fix(backmerge): checkout backmerged branches with commit hash to avoi…
80c9ced 
…d `Updates were rejected because the tip of your current branch is behind` git error on push - fixes #23

Signed-off-by: kilianpaquier <kilian@kilianpaquier.com>
@kilianpaquier kilianpaquier linked a pull request Oct 26, 2024 that will close this issue
new features and fixes in v1.5.0 #27
Merged
github-actions bot pushed a commit that referenced this issue Oct 26, 2024
@semantic-release-bot
chore(release): v1.5.0-next.5 [skip ci]
5775881 
## [1.5.0-next.5](v1.5.0-next.4...v1.5.0-next.5) (2024-10-26)

### Features

* **config:** add `checkHasPull` configuration to bypass pull request verification when trying to create one ([876c819](876c819))
* ensure git is spawnable by backmerge processes and print associated version in semantic-release verifyConditions ([ccabb07](ccabb07))

### Bug Fixes

* **backmerge:** checkout backmerged branches with commit hash to avoid `Updates were rejected because the tip of your current branch is behind` git error on push - fixes [#23](#23) ([80c9ced](80c9ced))
@github-actions GitHub Actions
Copy link
Contributor

🎉 This issue has been resolved in version v1.5.0-next.5 🎉

@github-actions github-actions bot added the released on @next Issue or pull request released next channel label Oct 26, 2024
kilianpaquier pushed a commit that referenced this issue Oct 26, 2024
@semantic-release-bot @kilianpaquier
chore(release): v1.5.0-next.5 [skip ci]
e94551e 
## [1.5.0-next.5](v1.5.0-next.4...v1.5.0-next.5) (2024-10-26)

### Features

* **config:** add `checkHasPull` configuration to bypass pull request verification when trying to create one ([876c819](876c819))
* ensure git is spawnable by backmerge processes and print associated version in semantic-release verifyConditions ([ccabb07](ccabb07))

### Bug Fixes

* **backmerge:** checkout backmerged branches with commit hash to avoid `Updates were rejected because the tip of your current branch is behind` git error on push - fixes [#23](#23) ([80c9ced](80c9ced))
github-actions bot pushed a commit that referenced this issue Oct 26, 2024
@semantic-release-bot
chore(release): v1.5.0 [skip ci]
d7b2853 
## [1.5.0](v1.4.0...v1.5.0) (2024-10-26)

### Features

* avoid trying to create pull requests when one already exists between two branches to be backmerge'd - [#19](#19) ([27a9019](27a9019))
* **config:** add `checkHasPull` configuration to bypass pull request verification when trying to create one ([e61d12a](e61d12a))
* ensure git is spawnable by backmerge processes and print associated version in semantic-release verifyConditions ([aa8d6ae](aa8d6ae))

### Bug Fixes

* **backmerge:** checkout backmerged branches with commit hash to avoid `Updates were rejected because the tip of your current branch is behind` git error on push - fixes [#23](#23) ([5328edb](5328edb))
* **config:** allow no platform as input ([6e2ced6](6e2ced6))
* **debug:** invalid prefix with debug namespace ([4fd3f13](4fd3f13))
* **platforms:** invalid check on api path prefix during platform handler initialization ([119ba60](119ba60))

### Chores

* **release:** v1.5.0-next.1 [skip ci] ([acaa328](acaa328)), closes [#19](#19)
* **release:** v1.5.0-next.2 [skip ci] ([f7d6f67](f7d6f67))
* **release:** v1.5.0-next.3 [skip ci] ([3408484](3408484))
* **release:** v1.5.0-next.4 [skip ci] ([474ea41](474ea41))
* **release:** v1.5.0-next.5 [skip ci] ([e94551e](e94551e)), closes [#23](#23)
@github-actions GitHub Actions
Copy link
Contributor

🎉 This issue has been resolved in version v1.5.0 🎉

@github-actions github-actions bot added the released Issue or pull request released main channel label Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@kilianpaquier kilianpaquier

Labels
bug Something isn't working javascript Pull requests that update Javascript code released on @next Issue or pull request released next channel released Issue or pull request released main channel
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

new features and fixes in v1.5.0 kilianpaquier/semantic-release-backmerge
1 participant
@kilianpaquier